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

Upgrade OpenLayers to 2.13.1 #255

Merged
merged 7 commits into from
Dec 16, 2013
Merged

Upgrade OpenLayers to 2.13.1 #255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
421dc34
Upgrade OpenLayers to 2.13.1
Nov 13, 2013
65f2932
Updated mapcomposer gxp, buildjs and config to manage OpenLayers 2.13.1
Nov 13, 2013
d4626ab
Porting TimeSlider in Destination branch
Nov 15, 2013
88021e6
add External timemanager to composer.html
Nov 15, 2013
3b822a5
Update Openlayers Destination Ext according to Openlayers 2.13.1
Nov 22, 2013
af1ed79
Gate Real Time Data task
Dec 15, 2013
0d724e2
merge last change from c008d
Dec 15, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
41 changes: 39 additions & 2 deletions mapcomposer/app/static/config/mapStoreConfig.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@
"center": [1103893.13597286, 5651406.520669],
"zoom": 7,
"maxExtent": [
456125.02434063, 5403020.7962146,
1323838.1693132, 5887325.807362
-20037508.34,-20037508.34,
20037508.34,20037508.34
],
"layers": [

Expand Down Expand Up @@ -243,6 +243,14 @@
"tiled": true,
"group": ["Roads","Strade","Strade"," Straßen"],
"visibility": false
},{
"source": "destination",
"title": "Gate",
"name": "siig_gate_geo_gate",
"displayInLayerSwitcher": true,
"tiled": true,
"group": ["Real time data","Dati in tempo reale","Données en temps réel","Echtzeitdaten"],
"visibility": true
}
]
},
Expand Down Expand Up @@ -440,6 +448,24 @@
"target":"paneltbar",
"index":21
}
},{
"ptype":"gxp_playback",
"outputTarget": "map",
"playbackMode": "range",
"showIntervals": false,
"labelButtons": false,
"settingsButton": true,
"rateAdjuster": false,
"dynamicRange": false,
"timeFormat": "l, F d, Y g:i:s A",
"outputConfig": {
"controlConfig":{
"step": 1,
"units": "Hours",
"range": ["2013-11-03T01:00:00.000Z", "2013-11-04T00:00:00.000Z"],
"frameRate": 1
}
}
},
{
"actions": ["->"],
Expand Down Expand Up @@ -509,6 +535,17 @@
"geoStoreUser": "base",
"geoStorePassword": "base"
},
{
"ptype": "gxp_gatetimeslidertab",
"id": "gatetimeslidertab",
"wfsUrl":"http://destination.geo-solutions.it/geoserver_test/ows",
"wfsVersion": "1.1.0",
"destinationNS": "destination",
"statisticFeature": "siig_gate_t_dato_statistico",
"timeFeature": "siig_gate_t_dato",
"layerGates":"siig_gate_geo_gate",
"outputTarget": "east"
},
{
"ptype": "gxp_tabpanelwfsgrids",
"outputTarget": "featurelist",
Expand Down
61 changes: 52 additions & 9 deletions mapcomposer/app/static/config/online.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"geoStoreBase": "http://destination.geo-solutions.it/geostore/rest/",
"proxy": "/http_proxy/proxy/?url=",
"geoStoreBase": "http://localhost:8080/geostore/rest/",
"proxy": "/proxy/?url=",
"defaultLanguage": "it",
"embedding": false,
"gsSources": {
Expand All @@ -24,6 +24,7 @@
"title": "Destination GeoServer",
"version": "1.1.1",
"url": "http://destination.geo-solutions.it/geoserver_test/destination/ows",
"SRS": "EPSG:3857",
"layerBaseParams": {
"TILED": true,
"TILESORIGIN": "-180,-90"
Expand All @@ -36,9 +37,13 @@
"center": [1103893.13597286, 5651406.520669],
"zoom": 7,
"maxExtent": [
456125.02434063, 5403020.7962146,
1323838.1693132, 5887325.807362
-20037508.34,-20037508.34,
20037508.34,20037508.34
],
"restrictedExtent": [
-20037508.34,-20037508.34,
20037508.34,20037508.34
],
"layers": [

{
Expand Down Expand Up @@ -243,6 +248,14 @@
"tiled": true,
"group": ["Roads","Strade","Strade"," Straßen"],
"visibility": false
},{
"source": "destination",
"title": "Gate",
"name": "siig_gate_geo_gate",
"displayInLayerSwitcher": true,
"tiled": true,
"group": ["Real time data","Dati in tempo reale","Données en temps réel","Echtzeitdaten"],
"visibility": true
}
]
},
Expand Down Expand Up @@ -435,7 +448,25 @@
"target": "paneltbar",
"index": 21
}
},
},{
"ptype":"gxp_playback",
"outputTarget": "map",
"playbackMode": "range",
"showIntervals": false,
"labelButtons": false,
"settingsButton": true,
"rateAdjuster": false,
"dynamicRange": false,
"timeFormat": "l, F d, Y g:i:s A",
"outputConfig": {
"controlConfig":{
"step": 1,
"units": "Hours",
"range": ["2013-11-03T01:00:00.000Z", "2013-11-04T00:00:00.000Z"],
"frameRate": 1
}
}
},
{
"actions": ["->"],
"actionTarget": "paneltbar"
Expand Down Expand Up @@ -478,8 +509,7 @@
"target": "paneltbar",
"index": 25
}
},
{
},{
"ptype": "gxp_syntheticview",
"outputTarget": "east",
"id": "syntheticview",
Expand All @@ -500,8 +530,21 @@
"wfsVersion": "1.1.0",
"destinationNS": "destination",
"index": 28,
"geoStoreBase":"http://destination.geo-solutions.it/geostore/rest/",
"proxy":"/http_proxy/?url="
"geoStoreBase":"http://localhost:8080/geostore/rest/",
"proxy":"/proxy/?url=",
"geoStoreUser": "super",
"geoStorePassword": "super"
},
{
"ptype": "gxp_gatetimeslidertab",
"id": "gatetimeslidertab",
"wfsUrl":"http://destination.geo-solutions.it/geoserver_test/ows",
"wfsVersion": "1.1.0",
"destinationNS": "destination",
"statisticFeature": "siig_gate_t_dato_statistico",
"timeFeature": "siig_gate_t_dato",
"layerGates":"siig_gate_geo_gate",
"outputTarget": "east"
},
{
"ptype": "gxp_tabpanelwfsgrids",
Expand Down
Loading