aboutsummaryrefslogtreecommitdiffstats
path: root/data
diff options
context:
space:
mode:
authorStruan Donald <struan@exo.org.uk>2018-04-04 09:49:38 +0100
committerMatthew Somerville <matthew-github@dracos.co.uk>2018-08-03 21:35:40 +0100
commit30426bc093541066f8cc2f40b4a23261d5e4526c (patch)
tree528a2d6b8f481ba63f31f0ef09477445678a5e62 /data
parent9f341adabd2a22de7e13c43e860bb3741017bf58 (diff)
[UK] Pull in cobrand asset files on national site.
Also add body name to layer defaults, so they are only used where appropriate. Switch mapit area javascript calls to GeoJSON, so we can drop KML support in OpenLayers.wfs.js which saves a small amount of bandwidth.
Diffstat (limited to 'data')
-rw-r--r--data/buckinghamshire/openlayers.buckinghamshire.cfg53
-rw-r--r--data/openlayers.wfs.cfg (renamed from data/bathnes/openlayers.bathnes.cfg)3
2 files changed, 1 insertions, 55 deletions
diff --git a/data/buckinghamshire/openlayers.buckinghamshire.cfg b/data/buckinghamshire/openlayers.buckinghamshire.cfg
deleted file mode 100644
index 2819c0627..000000000
--- a/data/buckinghamshire/openlayers.buckinghamshire.cfg
+++ /dev/null
@@ -1,53 +0,0 @@
-# This file includes the OpenLayers code that FixMyStreet currently uses.
-
-[first]
-
-[last]
-
-[include]
-# Have to include the renderers manually
-OpenLayers/Renderer/Canvas.js
-OpenLayers/Renderer/SVG.js
-OpenLayers/Renderer/VML.js
-OpenLayers/Strategy/Fixed.js
-OpenLayers/Strategy/BBOX.js
-OpenLayers/Strategy/Filter.js
-OpenLayers/Control/ArgParser.js
-OpenLayers/Control/Attribution.js
-OpenLayers/Control/DragFeature.js
-OpenLayers/Control/Navigation.js
-OpenLayers/Control/PanZoom.js
-OpenLayers/Control/PinchZoom.js
-OpenLayers/Control/Permalink.js
-OpenLayers/Control/SelectFeature.js
-OpenLayers/Format/GeoJSON.js
-OpenLayers/Format/JSON.js
-OpenLayers/Format/KML.js
-OpenLayers/Handler/Click.js
-OpenLayers/Feature/Vector.js
-OpenLayers/Rule.js
-OpenLayers/Style.js
-OpenLayers/StyleMap.js
-OpenLayers/Geometry/Point.js
-OpenLayers/Protocol/HTTP.js
-OpenLayers/Layer/SphericalMercator.js # For 27700 conversion
-OpenLayers/Layer/Vector.js
-OpenLayers/Layer/OSM.js
-OpenLayers/Popup/FramedCloud.js
-# Needed by Protocol/HTTP (for Strategy/BBOX bbox)
-# This loads in needed Filters too.
-OpenLayers/Format/QueryStringFilter.js
-# For Angus cobrand
-OpenLayers/Format/WFS.js
-OpenLayers/Format/WFSCapabilities.js
-OpenLayers/Format/WFSCapabilities/v1.js
-OpenLayers/Format/WFSCapabilities/v1_0_0.js
-OpenLayers/Format/WFSCapabilities/v1_1_0.js
-OpenLayers/Format/WFSDescribeFeatureType.js
-OpenLayers/Protocol/WFS.js
-OpenLayers/Protocol/WFS/v1.js
-OpenLayers/Protocol/WFS/v1_0_0.js
-OpenLayers/Protocol/WFS/v1_1_0.js
-
-[exclude]
-
diff --git a/data/bathnes/openlayers.bathnes.cfg b/data/openlayers.wfs.cfg
index 45eb2b26e..2e64b4789 100644
--- a/data/bathnes/openlayers.bathnes.cfg
+++ b/data/openlayers.wfs.cfg
@@ -22,7 +22,6 @@ OpenLayers/Control/Permalink.js
OpenLayers/Control/SelectFeature.js
OpenLayers/Format/JSON.js
OpenLayers/Format/GeoJSON.js
-OpenLayers/Format/KML.js
OpenLayers/Handler/Click.js
OpenLayers/Feature/Vector.js
OpenLayers/Rule.js
@@ -37,7 +36,7 @@ OpenLayers/Popup/FramedCloud.js
# Needed by Protocol/HTTP (for Strategy/BBOX bbox)
# This loads in needed Filters too.
OpenLayers/Format/QueryStringFilter.js
-# For Angus cobrand
+# For asset layers
OpenLayers/Format/WFS.js
OpenLayers/Format/WFSCapabilities.js
OpenLayers/Format/WFSCapabilities/v1.js