Merge pull request #4895 from camptocamp/merge23

Merge remote-tracking branch 'origin/2.3' into 2.4

Makefile

@@ -242,8 +242,9 @@ gh-pages: .build/python-venv.timestamp
 		--app 'Alternate mobile application' apps/mobile_alt.html 'An alternate mobile example application for GeoMapFish.' \
 		--app 'Alternate desktop application' apps/desktop_alt.html 'An alternate desktop example application for GeoMapFish.' \
 		--app 'Iframe api application' apps/iframe_api.html 'A desktop application for GeoMapFish without any tools that can be used within an iframe.' \
-		--app 'Object editing viewer' apps/oeview.html 'An example application for viewing an object.' \
-		--app 'Object editing editor' apps/oeedit.html 'An example application for editing an object.' \
+		--app 'Object editing editor' \
+			'apps/oeedit.html?objectediting_geomtype=MultiPolygon&objectediting_id=Test&objectediting_layer=112&objectediting_theme=ObjectEditing&objectediting_property=name&tree_groups=ObjectEditing' \
+			'An example application for editing an object.' \
 		$< $(GMF_EXAMPLES_HTML_FILES) > $@
 
 .build/test-check-example/%.check.timestamp: test/check-example/%.html \

contribs/gmf/src/objectediting/component.js

@@ -22,6 +22,14 @@ import {getUid as olUtilGetUid} from 'ol/util.js';
 import olCollection from 'ol/Collection.js';
 import * as olEvents from 'ol/events.js';
 import olFormatGeoJSON from 'ol/format/GeoJSON.js';
+import Point from 'ol/geom/Point.js';
+import LineString from 'ol/geom/LineString.js';
+import LinearRing from 'ol/geom/LinearRing.js';
+import Polygon from 'ol/geom/Polygon.js';
+import MultiPoint from 'ol/geom/MultiPoint.js';
+import MultiLineString from 'ol/geom/MultiLineString.js';
+import MultiPolygon from 'ol/geom/MultiPolygon.js';
+import GeometryCollection from 'ol/geom/GeometryCollection.js';
 import olLayerImage from 'ol/layer/Image.js';
 import olLayerTile from 'ol/layer/Tile.js';
 import olInteractionModify from 'ol/interaction/Modify.js';
@@ -32,6 +40,7 @@ import olStyleStyle from 'ol/style/Style.js';
 
 // @ts-ignore: not supported import
 import {OL3Parser} from 'jsts/io';
+import 'jsts/monkey.js';
 
 
 /**
@@ -317,7 +326,11 @@ function Controller($scope, $timeout, gettextCatalog,
    * @type {!jsts.io.OL3Parser}
    * @private
    */
-  this.jstsOL3Parser_ = new OL3Parser();
+  this.jstsOL3Parser_ = new OL3Parser(undefined, {
+    geom: {
+      Point, LineString, LinearRing, Polygon, MultiPoint, MultiLineString, MultiPolygon, GeometryCollection
+    }
+  });
 
   /**
    * The state of the feature determines whether the next 'save' request

contribs/gmf/src/query/windowComponent.js

@@ -531,7 +531,6 @@ QueryWindowController.prototype.highlightCurrentFeature_ = function(opt_lastFeat
 QueryWindowController.prototype.close = function() {
   this.open = false;
   this.clear();
-  this.ngeoMapQuerent_.clear();
 };