make geoserver url configurable since SFMTA now has it at the root level

planetfederal · Jul 18, 2014 · f25c6c4 · f25c6c4
1 parent ccaebed
commit f25c6c4
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/app/static/image-browser/index.html b/app/static/image-browser/index.html
@@ -32,6 +32,7 @@
         OpenLayers.ImgPath = "../externals/openlayers/img/";
         OpenLayers.Layer.WMS.prototype.DEFAULT_PARAMS.transparent = true;
         OpenLayers.DOTS_PER_INCH = 25.4 / 0.28;
+        var geoserver = '/geoserver';
         var app = new gxp.Viewer({
             listeners: {
                 'portalready': function() {
@@ -130,15 +131,15 @@
                         anchored: false,
                         layerName: "asbuilt:images",
                         rectifiedLayerName: "asbuilt:sfmta_rectified_images",
-                        url: "/geoserver/wms",
+                        url: geoserver + "/wms",
                         width: 600,
                         height: 400
                     }
                 }, {
                     ptype: "app_geocoder",
                     outputTarget: "paneltbar",
                     outputConfig: {
-                        url: "/geoserver/wfs",
+                        url: geoserver + "/wfs",
                         featureType: "SFADDRESSPOINTS",
                         featurePrefix: "asbuilt",
                         srsName: "EPSG:900913",
@@ -223,7 +224,7 @@
             defaultSourceType: "gxp_wmssource",
             sources: {
                 local: {    
-                    url: "/geoserver/ows",
+                    url: geoserver + "/ows",
                     title: "Local GeoServer",
                     version: "1.1.1"
                 },

diff --git a/app/static/image-rectifier/index.html b/app/static/image-rectifier/index.html
@@ -31,6 +31,7 @@
         OpenLayers.ImgPath = "../externals/openlayers/img/";
         OpenLayers.Layer.WMS.prototype.DEFAULT_PARAMS.transparent = true;
         OpenLayers.DOTS_PER_INCH = 25.4 / 0.28;
+        var geoserver = "/geoserver";
 
         var portalsReady = 0;
         var createViewport = function() {
@@ -48,7 +49,7 @@
             }
         };
 
-        var localGeoserver = "/geoserver/ows";
+        var localGeoserver = geoserver + "/ows";
         var layerName = "asbuilt:images";
         // this is the base path on the server where rectified images will be saved
         var saveBasePath = "/usr/share/opengeo-suite-data/geoserver_data/sfmta_rectified_images/"

diff --git a/app/static/image-tagger/index.html b/app/static/image-tagger/index.html
@@ -33,6 +33,7 @@
         OpenLayers.ImgPath = "../externals/openlayers/img/";
         OpenLayers.Layer.WMS.prototype.DEFAULT_PARAMS.transparent = true;
         OpenLayers.DOTS_PER_INCH = 25.4 / 0.28;
+        var geoserver = "/geoserver";
         var app = new gxp.Viewer({
             listeners: {
                 'portalready': function() {
@@ -130,7 +131,7 @@
                         anchored: false,
                         layerName: "asbuilt:images",
                         rectifiedLayerName: "asbuilt:sfmta_rectified_images",
-                        url: "/geoserver/ows",
+                        url: geoserver + "/ows",
                         readOnly: false,
                         width: 600,
                         height: 400
@@ -139,7 +140,7 @@
                     ptype: "app_geocoder",
                     outputTarget: "paneltbar",
                     outputConfig: {
-                        url: "/geoserver/wfs",
+                        url: geoserver + "/wfs",
                         featureType: "SFADDRESSPOINTS",
                         featurePrefix: "asbuilt",
                         srsName: "EPSG:900913",
@@ -230,7 +231,7 @@
             defaultSourceType: "gxp_wmssource",
             sources: {
                 local: {    
-                    url: "/geoserver/ows",
+                    url: geoserver + "/ows",
                     title: "Local GeoServer",
                     version: "1.1.1"
                 },