deegree#191 - enhanced copyright configuration

lat-lon · Jun 30, 2016 · 6a512ac · 6a512ac
1 parent 97164ec
commit 6a512ac
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 2 deletions.
diff --git a/deegree-services/deegree-services-wms/src/main/java/org/deegree/services/wms/MapService.java b/deegree-services/deegree-services-wms/src/main/java/org/deegree/services/wms/MapService.java
@@ -148,7 +148,7 @@ public MapService( ServiceConfigurationType conf, Workspace workspace, int updat
                     }
                 }
             }
-            copyright = conf.getCopyright();
+            copyright = conf.getCopyright() != null ? conf.getCopyright().getText() : null;
         }
         getLegendHandler = new GetLegendHandler( this );
     }

diff --git a/...services-wms/src/main/resources/META-INF/schemas/services/wms/3.4.0/wms_configuration.xsd b/...services-wms/src/main/resources/META-INF/schemas/services/wms/3.4.0/wms_configuration.xsd
@@ -57,7 +57,7 @@
     <sequence>
       <element name="DefaultLayerOptions" type="wms:LayerOptionsType" minOccurs="0" />
       <element name="ThemeId" type="string" minOccurs="0" maxOccurs="unbounded" />
-      <element name="Copyright" minOccurs="0" type="string" />
+      <element name="Copyright" minOccurs="0" type="wms:CopyrightType" />
     </sequence>
   </complexType>
 
@@ -150,6 +150,25 @@
     </sequence>
   </complexType>
 
+  <complexType name="CopyrightType">
+    <annotation>
+      <documentation>Configure a copyright displayed in GetMap responses. A text or image 
+      (via relative or absolute file reference or http url) can be configured. 
+      Furthermore the position of the copyright can be specified with OffsetX/OffsetY (default is 8/13). 
+      Anchor point in the GetMap response as well as the text or image is the lower-left corner.</documentation>
+    </annotation>
+    <sequence>
+      <choice minOccurs="1">
+        <element name="Text" type="string" />
+        <element name="Image" type="string" />
+      </choice>
+      <sequence minOccurs="0">
+        <element name="OffsetX" type="int" minOccurs="1" />
+        <element name="OffsetY" type="int" minOccurs="1" />
+      </sequence>
+    </sequence>
+  </complexType>
+
   <simpleType name="WMSVersionType">
     <restriction base="string">
       <enumeration value="1.1.1" />
-Original file line number
+Diff line change
@@ Expand Up @@
                         }
                     }
                 }
-                copyright = conf.getCopyright();
+                copyright = conf.getCopyright() != null ? conf.getCopyright().getText() : null;
             }
             getLegendHandler = new GetLegendHandler( this );
         }
@@ Expand Down @@