diff --git a/src/main/webapp/js/observationFormMap.js b/src/main/webapp/js/observationFormMap.js index bb269380137f7bf283fac32d1f9e3cb4686672aa..7d38d57825759299fe14602be4461cf60298a6cc 100755 --- a/src/main/webapp/js/observationFormMap.js +++ b/src/main/webapp/js/observationFormMap.js @@ -57,6 +57,20 @@ function initMap(center, zoomLevel, displayMarker, drawnObjs) { }) }); + var topo2graatone = new ol.layer.Tile({ + title: "GrĂ¥tone", + type: 'base', + visible: false, + source: new ol.source.TileWMS({ + url: "http://opencache.statkart.no/gatekeeper/gk/gk.open?", + params: { + LAYERS: 'topo2graatone', + VERSION: '1.1.1' + } + }) + }); + + var fylke_layer = new ol.layer.Vector({ title: 'Fylkesgrenser', type: 'overlay', @@ -64,7 +78,7 @@ function initMap(center, zoomLevel, displayMarker, drawnObjs) { source: new ol.source.Vector({ projection: 'EPSG:3857', format: new ol.format.GeoJSON(), - url: '/geoserver/ows?srsname=EPSG:3857&format_options=decimals:0&service=WFS&version=1.0.0&outputFormat=json&request=GetFeature&typeName=sl:n5_forv_fylke_mv&' + url: 'http://kart13.skogoglandskap.no/geoserver/ows?srsname=EPSG:3857&format_options=decimals:0&service=WFS&version=1.0.0&outputFormat=json&request=GetFeature&typeName=sl:n5_forv_fylke_mv&' }), style: new ol.style.Style({ stroke: new ol.style.Stroke({ @@ -80,7 +94,7 @@ function initMap(center, zoomLevel, displayMarker, drawnObjs) { source: new ol.source.Vector({ projection: 'EPSG:3857', format: new ol.format.GeoJSON(), - url: '/geoserver/ows?srsname=EPSG:3857&format_options=decimals:0&service=WFS&version=1.0.0&outputFormat=json&request=GetFeature&typeName=sl:n2000_komm_flate&' + url: 'http://kart13.skogoglandskap.no/geoserver/ows?srsname=EPSG:3857&format_options=decimals:0&service=WFS&version=1.0.0&outputFormat=json&request=GetFeature&typeName=sl:n2000_komm_flate&' }), style: new ol.style.Style({ stroke: new ol.style.Stroke({ @@ -95,7 +109,7 @@ function initMap(center, zoomLevel, displayMarker, drawnObjs) { var map = new ol.Map({ target: 'observationFormMap', //layers: layers, - layers: [osm, bingArial, fylke_layer, kommune_layer], + layers: [osm, bingArial, topo2graatone, fylke_layer, kommune_layer], renderer: 'canvas' }); diff --git a/src/main/webapp/templates/observationForm.ftl b/src/main/webapp/templates/observationForm.ftl index f1cbe9a61b4492a03a00d01533b37428684912bb..1628384a12506bce5e971ebdcd2cac016800c795 100755 --- a/src/main/webapp/templates/observationForm.ftl +++ b/src/main/webapp/templates/observationForm.ftl @@ -131,11 +131,9 @@ <label>What do you want to draw</label> <select id="type"> <option value="Point">Point</option> - <option value="LineString">Line</option> <option value="Polygon">Polygon</option> </select> <button id="delete" type="button">Clear all</button> - <button id="save-button" type="button">Save</button> </div> <div id="observationFormMap" class="map"> </div>