Skip to content
This repository has been archived by the owner on May 6, 2021. It is now read-only.

Commit

Permalink
Fixed #370: implemented new config option scaleOverlayMode, to replac…
Browse files Browse the repository at this point in the history 
…e advancedScaleOverlay and support no scalebar at all
  • Loading branch information
@mbarto
mbarto committed Apr 18, 2014
1 parent f983baf commit 5fa91b7
Show file tree
Hide file tree
Showing 9 changed files with 335 additions and 8 deletions.
324 changes: 324 additions & 0 deletions mapcomposer/app/static/config/comunege.js
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,324 @@
{
"geoStoreBase":"",
"gnBaseUrl": "http://vm-gistest1/geonetwork/",
"defaultLanguage": "it",
"advancedScaleOverlay": true,
"tab": true,
"gsSources":{
"mapquest": {
"ptype": "gxp_mapquestsource"
},
"osm": {
"ptype": "gxp_osmsource"
},
"google": {
"ptype": "gxp_googlesource"
},
"bing": {
"ptype": "gxp_bingsource"
},
"ol": {
"ptype": "gxp_olsource"
},
"local": {
"ptype": "gxp_wmssource",
"title": "Local GeoServer",
"version":"1.1.1",
"url": "http://localhost:8080/geoserver/ows"
}
},
"map": {
"projection": "EPSG:900913",
"units": "m",
"center": [1250000.000000, 5370000.000000],
"zoom":5,
"maxExtent": [
-20037508.34, -20037508.34,
20037508.34, 20037508.34
],
"layers": [
{
"source": "local",
"title": "Circoscrizioni",
"name": "topp:circoscrizioni"
},
{
"source": "bing",
"title": "Bing Aerial",
"name": "Aerial",
"group": "background"
}, {
"source": "osm",
"title": "Open Street Map",
"name": "mapnik",
"group": "background"
},{
"source": "mapquest",
"title": "MapQuest OpenStreetMap",
"name": "osm",
"group": "background"
},{
"source": "google",
"title": "Google Roadmap",
"name": "ROADMAP",
"group": "background"
},{
"source": "google",
"title": "Google Terrain",
"name": "TERRAIN",
"group": "background"
},{
"source": "google",
"title": "Google Hybrid",
"name": "HYBRID",
"group": "background"
}
]
},
"customPanels":[
{
"xtype": "tabpanel",
"title": "Data Viewer",
"border": false,
"id": "south",
"region": "south",
"split":true,
"height": 330,
"collapsed": true,
"collapsible": true,
"activeItem": 0,
"header": true,
"items": [
{
"xtype": "container",
"title": "Feature Grid",
"border": false,
"layout": "fit",
"id": "featuregrid"
},{
"xtype": "container",
"title": "Metadata Explorer",
"iconCls": "csw-viewer",
"border": false,
"layout": "fit",
"id": "metadata"
}
]
},
{
"xtype": "panel",
"title": "Query Panel",
"border": false,
"id": "east",
"width": 400,
"height": 500,
"region": "east",
"layout": "fit",
"collapsed": false,
"collapsible": true,
"header": true
}

],
"removeTools": ["googleearth_plugin", "googleearth_separator"],
"customTools":[
{
"ptype":"gxp_print",
"customParams":{
"outputFilename":"mapstore-print",
"geodetic": true
},
"ignoreLayers": "Google Hybrid,Bing Aerial,Nessuno sfondo,Google Terrain,Google Roadmap,Marker,GeoRefMarker",
"printService":"http://vm-gistest1/geoserver/pdf/",
"legendPanelId":"legendPanel",
"actionTarget":{
"target":"paneltbar",
"index":4
}
},
{
"ptype": "gxp_featuremanager",
"id": "featuremanager",
"paging": false,
"page": {},
"layer": {
"source": "local",
"name": "topp:circoscrizioni"
},
"autoLoadFeatures": true
},
{
"ptype": "gxp_featureeditor",
"featureManager": "featuremanager",
"autoLoadFeatures": true
},
{
"ptype": "gxp_featuregrid",
"featureManager": "featuremanager",
"outputConfig": {
"loadMask": true
},
"showExportCSV": true,
"outputTarget": "featuregrid"
},
{
"ptype": "gxp_mouseposition",
"displayProjectionCode":"EPSG:4326",
"customCss": "font-weight: bold; text-shadow: 1px 0px 0px #FAFAFA, 1px 1px 0px #FAFAFA, 0px 1px 0px #FAFAFA,-1px 1px 0px #FAFAFA, -1px 0px 0px #FAFAFA, -1px -1px 0px #FAFAFA, 0px -1px 0px #FAFAFA, 1px -1px 0px #FAFAFA, 1px 4px 5px #aeaeae;color:#050505 "
},{
"ptype": "gxp_metadataexplorer",
"id": "metadataexplorer",
"outputTarget": "metadata",
"saveState": true,
"cswconfig": {
"catalogs": [
{"name": "CSI Piemonte", "url": "http://www.ruparpiemonte.it/geocatalogorp/geonetworkrp/srv/it/csw", "description": "GeoPortale della Regione Piemonte"},
{"name": "Comune di Firenze", "url": "http://datigis.comune.fi.it/geonetwork/srv/it/csw", "description": "GeoPortale del Comune di Firenze"},
{"name": "PTA", "url": "http://pta.partout.it/geoportalPTA/csw", "description": "Piattaforma Tecnologica alpina", "metaDataOptions":{"base":"http://pta.partout.it/geoportalPTA/catalog/search/resource/details.page","idParam":"uuid","idIndex":0}},
{"name": "Treviso", "url": "http://ows.provinciatreviso.it/geonetwork/srv/it/csw", "description": "Treviso Geonetwork"},
{"name": "kscNet", "url": "http://geoportal.kscnet.ru/geonetwork/srv/ru/csw", "description": "kscNet"},
{"name": "CSI-CGIAR", "url": "http://geonetwork.csi.cgiar.org/geonetwork/srv/en/csw", "description" : "CSI-CGIAR"},
{"name": "EauFrance", "url": "http://sandre.eaufrance.fr/geonetwork/srv/fr/csw", "description" : "EauFrance"},
{"name": "SOPAC", "url": "http://geonetwork.sopac.org/geonetwork/srv/en/csw", "description" : "SOPAC"},
{"name": "SADC", "url": "http://www.sadc.int/geonetwork/srv/en/csw", "description" : "SADC"},
{"name": "MAPAS", "url": "http://mapas.mma.gov.br/geonetwork/srv/en/csw", "description" : "MAPAS"}
],
"dcProperty": "title",
"initialBBox": {
"minx": 11.145,
"miny": 43.718,
"maxx": 11.348,
"maxy": 43.84
},
"cswVersion": "2.0.2",
"filterVersion": "1.1.0",
"start": 1,
"limit": 10,
"timeout": 60000
}
}, {
"actions": ["-"],
"actionTarget": "paneltbar"
}, {
"ptype": "gxp_geolocationmenu",
"actionTarget": {"target": "paneltbar", "index": 23},
"toggleGroup": "toolGroup"
}, {
"ptype": "gxp_addlayer",
"showCapabilitiesGrid": true,
"id": "addlayer"
}, {
"ptype": "gxp_spatialqueryform",
"featureManager": "featuremanager",
"featureGridContainer": "south",
"outputTarget": "east",
"showSelectionSummary": true,
"actions": null,
"id": "bboxquery",
"outputConfig":{
"outputSRS": "EPSG:900913",
"selectStyle":{
"strokeColor": "#ee9900",
"fillColor": "#ee9900",
"fillOpacity": 0.4,
"strokeWidth": 1
},
"spatialFilterOptions": {
"lonMax": 20037508.34,
"lonMin": -20037508.34,
"latMax": 20037508.34,
"latMin": -20037508.34
},
"bufferOptions": {
"minValue": 1,
"maxValue": 1000,
"decimalPrecision": 2,
"distanceUnits": "m"
}
},
"spatialSelectorsConfig":{
"bbox":{
"ptype": "gxp_spatial_bbox_selector"
},
"buffer":{
"ptype": "gxp_spatial_buffer_selector"
},
"circle":{
"ptype": "gxp_spatial_circle_selector",
"zoomToCurrentExtent": true
},
"polygon":{
"ptype": "gxp_spatial_polygon_selector"
},
"municipi":{
"ptype": "gxp_spatial_geocoding_selector",
"multipleSelection": false,
"name": "Municipi",
"label": "Municipi",
"searchComboOutputFormat": "json",
"wfsBaseURL": "http://geoserver.comune.genova.it/geoserver/wfs",
"geocoderTypeName": "TOPONOMASTICA:MUNICIPI",
"geocoderTypeRecordModel":[
{
"name":"id",
"mapping":"id"
},
{
"name":"name",
"mapping":"properties.NOME_MUNIC"
},
{
"name":"custom",
"mapping":"properties.COD_MUNIC"
},
{
"name":"geometry",
"mapping":"geometry"
}
],
"geocoderTypeSortBy":null,
"geocoderTypeQueriableAttributes":[
"NOME_MUNIC", "COD_MUNIC", "ID1"
],
"spatialOutputCRS": "EPSG:4326",
"geocoderTypePageSize": 10,
"zoomToCurrentExtent": true
},
"unita":{
"ptype": "gxp_spatial_geocoding_selector",
"multipleSelection": false,
"name": "Unita Urbanistiche",
"label": "Unita Urbanistiche",
"searchComboOutputFormat": "json",
"wfsBaseURL": "http://geoserver.comune.genova.it/geoserver/wfs",
"geocoderTypeName": "TOPONOMASTICA:UNITA_URBANISTICHE",
"geocoderTypeRecordModel":[
{
"name":"id",
"mapping":"id"
},
{
"name":"name",
"mapping":"properties.NOME_UU"
},
{
"name":"custom",
"mapping":"properties.COD_UU"
},
{
"name":"geometry",
"mapping":"geometry"
}
],
"geocoderTypeSortBy":null,
"geocoderTypeQueriableAttributes":[
"NOME_UU", "COD_UU", "ID1"
],
"spatialOutputCRS": "EPSG:3003",
"geocoderTypePageSize": 10,
"zoomToCurrentExtent": true
}
}
}
]
}
2 changes: 1 addition & 1 deletion mapcomposer/app/static/config/geonetwork.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"geoStoreBase":"",
"gnBaseUrl": "",
"defaultLanguage": "it",
"advancedScaleOverlay": true,
"scaleOverlayMode": "advanced",
"tab": true,
"gsSources":{
"mapquest": {
Expand Down
2 changes: 1 addition & 1 deletion mapcomposer/app/static/config/mapStoreConfig.js
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{

"advancedScaleOverlay": false,
"scaleOverlayMode": "basic",
"gsSources":{
"mapquest": {
"ptype": "gxp_mapquestsource"
Expand Down
2 changes: 1 addition & 1 deletion mapcomposer/app/static/config/spatialSelectorQueryConfig.js
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"advancedScaleOverlay": false,
"scaleOverlayMode": "basic",
"gsSources":{
"default": {
"ptype": "gxp_wmssource",
Expand Down
2 changes: 1 addition & 1 deletion mapcomposer/app/static/config/spatialSelectorWithoutWPSQueryConfig.js
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"advancedScaleOverlay": false,
"scaleOverlayMode": "basic",
"gsSources":{
"default": {
"ptype": "gxp_wmssource",
Expand Down
6 changes: 4 additions & 2 deletions mapcomposer/app/static/script/app/GeoExplorer.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,9 @@ var GeoExplorer = Ext.extend(gxp.Viewer, {

this.mapItems = [];

if(config.advancedScaleOverlay){
var scaleOverlayMode = config.scaleOverlayMode || 'basic';

if(scaleOverlayMode === 'advanced'){
this.mapItems.push({
xtype: "gxp_advancedscaleoverlay",
topOutUnits: config.scaleOverlayUnits ? config.scaleOverlayUnits.topOutUnits : null,
Expand All @@ -181,7 +183,7 @@ var GeoExplorer = Ext.extend(gxp.Viewer, {
showMousePosition: config.scaleOverlayUnits ? (config.scaleOverlayUnits.showMousePosition === true ? true : false) : false,
enableSetScaleUnits: config.scaleOverlayUnits ? true : false
});
}else{
}else if(scaleOverlayMode === 'basic') {
this.mapItems.push({
xtype: "gxp_scaleoverlay",
topOutUnits: config.scaleOverlayUnits ? config.scaleOverlayUnits.topOutUnits : null,
Expand Down
2 changes: 1 addition & 1 deletion mapcomposer/app/templates/composer.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,7 @@
}

app = new GeoExplorer.Composer({
advancedScaleOverlay: serverConfig.advancedScaleOverlay || false,
scaleOverlayMode : serverConfig.scaleOverlayMode || (serverConfig.advancedScaleOverlay ? 'advanced' : 'basic'),
defaultLanguage: serverConfig.defaultLanguage,
actionToolScale: serverConfig.actionToolScale || "small",
customPanels: serverConfig.customPanels,
Expand Down
2 changes: 1 addition & 1 deletion mapcomposer/app/templates/geonetwork.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -465,7 +465,7 @@
};*/

app = new GeoExplorer.Composer({
advancedScaleOverlay: serverConfig.advancedScaleOverlay || false,
scaleOverlayMode : serverConfig.scaleOverlayMode || (serverConfig.advancedScaleOverlay ? 'advanced' : 'basic'),
defaultLanguage: serverConfig.defaultLanguage,
actionToolScale: serverConfig.actionToolScale || "small",
geonetwork: true, // hidden/private config only used for the geonetwork use case
Expand Down
Loading

0 comments on commit 5fa91b7

Please sign in to comment.