From ec896fdf1cd32bc26e1f61082c1d55608c091e28 Mon Sep 17 00:00:00 2001 From: okauppinen Date: Fri, 11 Aug 2023 16:15:47 +0300 Subject: [PATCH] don't remove attributes.data and update comments --- .../map/layer/formatters/LayerJSONFormatterUSERDATA.java | 2 ++ .../nls/oskari/map/layer/formatters/LayerJSONFormatterWFS.java | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/service-map/src/main/java/fi/nls/oskari/map/layer/formatters/LayerJSONFormatterUSERDATA.java b/service-map/src/main/java/fi/nls/oskari/map/layer/formatters/LayerJSONFormatterUSERDATA.java index 6912bdaeb..2faaa4776 100644 --- a/service-map/src/main/java/fi/nls/oskari/map/layer/formatters/LayerJSONFormatterUSERDATA.java +++ b/service-map/src/main/java/fi/nls/oskari/map/layer/formatters/LayerJSONFormatterUSERDATA.java @@ -27,6 +27,8 @@ public JSONObject getJSON(OskariLayer baseLayer, UserDataLayer layer, String srs return this.getJSON(baseLayer, layer, srs, PropertyUtil.getDefaultLanguage()); } + // common parser for UserData layers + // override methods in subclasses if needed to highlight differences between them public JSONObject getJSON(OskariLayer baseLayer, UserDataLayer layer, String srs, String lang) { JSONObject layerJson = getBaseJSON(baseLayer, lang, IS_SECURE, srs); JSONHelper.putValue(layerJson, KEY_ISQUERYABLE, true); diff --git a/service-map/src/main/java/fi/nls/oskari/map/layer/formatters/LayerJSONFormatterWFS.java b/service-map/src/main/java/fi/nls/oskari/map/layer/formatters/LayerJSONFormatterWFS.java index 30a61fbea..814e43d25 100755 --- a/service-map/src/main/java/fi/nls/oskari/map/layer/formatters/LayerJSONFormatterWFS.java +++ b/service-map/src/main/java/fi/nls/oskari/map/layer/formatters/LayerJSONFormatterWFS.java @@ -18,9 +18,8 @@ public JSONObject getJSON(OskariLayer layer, final JSONObject layerJson = getBaseJSON(layer, lang, isSecure, crs); JSONHelper.putValue(layerJson, KEY_ISQUERYABLE, true); - // getBaseJSON adds these but model builder isn't using them. Frontend uses DescribeLayer response + // getBaseJSON adds options but model builder isn't using it. Frontend uses DescribeLayer response layerJson.remove(KEY_OPTIONS); - layerJson.optJSONObject(KEY_ATTRIBUTES).remove("data"); return layerJson; } }