Author: chatellier Date: 2009-10-14 16:45:10 +0000 (Wed, 14 Oct 2009) New Revision: 2663 Modified: isis-fish/trunk/pom.xml isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/IsisMapBean.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java Log: Update openmap (no ssx file needed) Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2009-10-14 10:41:07 UTC (rev 2662) +++ isis-fish/trunk/pom.xml 2009-10-14 16:45:10 UTC (rev 2663) @@ -187,7 +187,7 @@ <dependency> <groupId>openmap</groupId> <artifactId>openmap</artifactId> - <version>4.6.4</version> + <version>4.6.5</version> <scope>compile</scope> </dependency> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/IsisMapBean.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/IsisMapBean.java 2009-10-14 10:41:07 UTC (rev 2662) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/IsisMapBean.java 2009-10-14 16:45:10 UTC (rev 2663) @@ -283,7 +283,8 @@ String lineColor, String fillColor) { Properties p = new Properties(); p.setProperty(id+"."+ShapeLayer.shapeFileProperty, shapeFile); - p.setProperty(id+"."+ShapeLayer.spatialIndexProperty, spatialIndex); + // unneeded with openmap 4.6.5 + //p.setProperty(id+"."+ShapeLayer.spatialIndexProperty, spatialIndex); p.setProperty(id+"."+DrawingAttributes.linePaintProperty, lineColor); p.setProperty(id+"."+DrawingAttributes.fillPaintProperty, fillColor); ShapeLayer slayer = new ShapeLayer(); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java 2009-10-14 10:41:07 UTC (rev 2662) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java 2009-10-14 16:45:10 UTC (rev 2663) @@ -1078,8 +1078,8 @@ File destShp = new File(destDir, basename + ".shp"); FileUtil.copy(shp, destShp); - // copy ssx file - File destSsx = new File(destDir, basename + ".ssx"); + // copy ssx file (unneeded with openmap 4.6.5) + /*File destSsx = new File(destDir, basename + ".ssx"); if (ssx.exists()) { FileUtil.copy(ssx, destSsx); } else { @@ -1087,7 +1087,7 @@ log.info("Ssx file don't exist, try to generate it"); } SpatialIndex.createIndex(destShp.getPath(), destSsx.getPath()); - } + }*/ List<String> maps = fisheryRegion.getMapFileList(); maps.add(basename);