wms layer with api key are now saved in project

openjump-gis · Sep 29, 2024 · ab4f464 · ab4f464
1 parent 80fac23
commit ab4f464
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/com/vividsolutions/jump/workbench/model/WMSLayer.java b/src/com/vividsolutions/jump/workbench/model/WMSLayer.java
@@ -82,13 +82,15 @@ public WMSLayer() {
 
   public WMSLayer(LayerManager layerManager, String serverURL, String srs,
       List<String> layerNames, String format, String version) throws IOException {
-    this(layerManager, initializedService(serverURL, version), srs, layerNames,
+    this(layerManager, initializedService(serverURL, version, null), srs, layerNames,
         format);
   }
 
-  private static WMService initializedService(String serverURL, String version)
+  private static WMService initializedService(String serverURL, String version,
+                                              String apiKeyNameAndValue)
       throws IOException {
-    WMService initializedService = new WMService(serverURL, version);
+    WMService initializedService =
+        new WMService(serverURL, version, apiKeyNameAndValue, true);
     initializedService.initialize();
     return initializedService;
   }
@@ -268,7 +270,7 @@ public Blackboard getBlackboard() {
   public WMService getService() throws IOException {
     if (service == null) {
       Assert.isTrue(serverURL != null);
-      setService(initializedService(serverURL, wmsVersion));
+      setService(initializedService(serverURL, wmsVersion, apiKeyNameAndValue));
     }
     return service;
   }

diff --git a/src/com/vividsolutions/jump/workbench/model/WMSLayer.java2xml b/src/com/vividsolutions/jump/workbench/model/WMSLayer.java2xml
@@ -12,6 +12,7 @@
   <element xml-name="format" java-name="format"/>
   <element xml-name="alpha" java-name="alpha"/>
   <element xml-name="version" java-name="wmsVersion"/>
+  <element xml-name="apikey-name-and-value" java-name="apiKeyNameAndValue"/>
   <element xml-name="wms-layer-names">
     <element xml-name="wms-layer-name" java-name="layerName"/>
   </element>