[AH-289] wfs custom style support

oskariorg · Nov 12, 2013 · 9a37d9b · 9a37d9b
1 parent c3d8f02
commit 9a37d9b
Show file tree

Hide file tree

Showing 19 changed files with 2,394 additions and 59 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 */target
+*/*/target
 */.settings
 */.classpath
 */.project
@@ -8,3 +9,4 @@
 .project
 /data/
 /servlet-map/src/main/webapp/WEB-INF/jetty-env.xml
+transport.log
diff --git a/content-resources/src/main/resources/sql/views/07-wfs-new-impl-view.sql b/content-resources/src/main/resources/sql/views/07-wfs-new-impl-view.sql
@@ -163,6 +163,9 @@ UPDATE portti_view_bundle_seq set startup = '{
             },
             "mapfull" : {
                 "bundlePath" : "/Oskari/packages/framework/bundle/"
+            },
+            "ui-components" : {
+                "bundlePath" : "/Oskari/packages/framework/bundle/"
             }
         },
         "Require-Bundle-Instance" : []

diff --git a/...xt/OskariMarkFactory/src/main/java/org/geotools/renderer/oskari/TTFMarkFactoryOskari.java b/...xt/OskariMarkFactory/src/main/java/org/geotools/renderer/oskari/TTFMarkFactoryOskari.java
@@ -76,7 +76,7 @@ public Shape getShape(Graphics2D graphics, Expression symbolUrl, Feature feature
         String[] fontElements = markUrl.substring(9).split("#");
 
         // look up the font
-        Font font = FontCache.getDefaultInsance().getFont(fontElements[0]);
+        Font font = Font.createFont(Font.TRUETYPE_FONT, this.getClass().getResourceAsStream("/dot-markers.ttf"));
 
         if (font == null) {
             throw new IllegalArgumentException("Unknown font " + fontElements[0]);

diff --git a/...ver-ext/OskariMarkFactory/dot-markers.ttf → ...actory/src/main/resources/dot-markers.ttf b/...ver-ext/OskariMarkFactory/dot-markers.ttf → ...actory/src/main/resources/dot-markers.ttf
diff --git a/service-OGC/pom.xml b/service-OGC/pom.xml
@@ -32,11 +32,13 @@
     <artifactId>flexjson</artifactId>
     <version>2.0</version>
 </dependency>
+<!--
 <dependency>
     <groupId>org.eclipse</groupId>
     <artifactId>xsd</artifactId>
     <version>2.3.0-v200706262000</version>
 </dependency>
+-->
 
         <dependency>
             <groupId>org.geotools</groupId>

diff --git a/service-map/src/main/java/fi/mml/map/mapwindow/util/MapLayerWorker.java b/service-map/src/main/java/fi/mml/map/mapwindow/util/MapLayerWorker.java
@@ -501,10 +501,12 @@ private static void populateLayerStylesOnJSONArray(JSONObject styleJSON, Layer l
           List<WFSSLDStyle> styleList = wfsService.findWFSLayerStyles(layer.getId());
           try{
             if ( styleList.size() > 0) {
+               JSONArray arr = new JSONArray();
                for (WFSSLDStyle style : styleList) {
-                 JSONObject obj =  createStylesJSON(style.getName(), style.getName(), style.getName());
-                 styleJSON.accumulate("styles", obj);
+                 JSONObject obj =  createStylesJSON(style.getName(), style.getName(), style.getName());;
+                 arr.put(obj);
                }
+               styleJSON.put("styles", arr);
             }
             }catch (Exception e) {
               throw new RuntimeException(e);

diff --git a/transport/pom.xml b/transport/pom.xml
@@ -374,6 +374,28 @@
             <artifactId>oskari-base</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
+        <dependency>
+            <groupId>fi.nls.oskari</groupId>
+            <artifactId>shared-test-resources</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.geoserver</groupId>
+            <artifactId>OskariMarkFactory</artifactId>
+            <version>1.0</version>
+            <!--
+            <exclusions>
+                <exclusion>
+                    <groupId>org.geoserver</groupId>
+                    <artifactId>main</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.geotools</groupId>
+                    <artifactId>gt-shapefile-renderer</artifactId>
+                </exclusion>
+            </exclusions>
+            -->
+        </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>

diff --git a/transport/src/main/java/fi/nls/oskari/pojo/SessionStore.java b/transport/src/main/java/fi/nls/oskari/pojo/SessionStore.java
@@ -375,7 +375,7 @@ public void setKeepPrevious(boolean keepPrevious) {
 	 *         otherwise.
 	 */
 	public boolean save() {
-        JedisManager.setex(KEY + client, 86400,  getAsJSON());
+        JedisManager.setex(KEY + client, 86400, getAsJSON());
     	return this.isValid();
 	}