Merge pull request #255 from mricca/destination_geostore

Upgrade OpenLayers to 2.13.1
geosolutions-it · Dec 16, 2013 · 006a4a7 · 006a4a7
2 parents 2b559f0 + 0d724e2
commit 006a4a7
Show file tree

Hide file tree

Showing 1,018 changed files with 55,682 additions and 27,853 deletions.
diff --git a/mapcomposer/app/static/config/mapStoreConfig.js b/mapcomposer/app/static/config/mapStoreConfig.js
@@ -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": [                      
 
@@ -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
         }
         ]
     },
@@ -446,6 +454,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": ["->"], 
@@ -515,6 +541,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",

diff --git a/mapcomposer/app/static/config/online.js b/mapcomposer/app/static/config/online.js
@@ -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": {
@@ -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"
@@ -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": [                      
 
         {
@@ -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
         }
         ]
 	},
@@ -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"
@@ -478,8 +509,7 @@
 			"target": "paneltbar",
 			"index": 25
 		}
-	},
-	{
+	},{
 		"ptype": "gxp_syntheticview",
 		"outputTarget": "east",
 		"id": "syntheticview",
@@ -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",