Changeset 28573 in osm for applications/editors/josm/plugins/poly/src

Timestamp:

2012-08-19T09:36:45+02:00 (12 years ago)

Author:

zverik

Message:

poly: utf8 for input, file name for default save name

Location:

applications/editors/josm/plugins/poly/src/poly

Files:

• PolyExporter.java (modified) (2 diffs)
• PolyImporter.java (modified) (1 diff)

applications/editors/josm/plugins/poly/src/poly/PolyExporter.java

@@ -41 +41 @@
                 DataSet ds = ((OsmDataLayer)layer).data;
                 Map<Way, Boolean> ways = new TreeMap<Way, Boolean>(new AreaComparator());
-                String polygonName = layer.getName();
+                String polygonName = file.getName();
+                if( polygonName.indexOf('.') > 0 )
+                    polygonName = polygonName.substring(0, polygonName.indexOf('.'));
                 for( Way w : ds.getWays() ) {
                     if( w.isClosed() ) {
@@ -58 +60 @@
                         ways.put(w, outer);
                         if( w.hasKey("name") )
-                            polygonName = w.get("name");
+                            polygonName = w.get("name").replace("\n", " ");
                     }
                 }

applications/editors/josm/plugins/poly/src/poly/PolyImporter.java

@@ -47 +47 @@
             progressMonitor.beginTask(tr("Reading polygon filter file..."), 2);
             progressMonitor.indeterminateSubTask(tr("Reading polygon filter file..."));
-            reader = new BufferedReader(new InputStreamReader(in));
+            reader = new BufferedReader(new InputStreamReader(in, "UTF8"));
             List<Area> areas = loadPolygon(reader);
             progressMonitor.worked(1);