Changeset 12816 in josm for trunk/src/org/openstreetmap/josm/io
- Timestamp:
- 2017-09-10T13:58:18+02:00 (7 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/io
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/io/GeoJSONWriter.java
r12809 r12816 30 30 import org.openstreetmap.josm.data.osm.visitor.OsmPrimitiveVisitor; 31 31 import org.openstreetmap.josm.data.projection.Projection; 32 import org.openstreetmap.josm.data.projection.Projections; 32 33 import org.openstreetmap.josm.gui.layer.OsmDataLayer; 33 34 import org.openstreetmap.josm.gui.mappaint.ElemStyles; 34 import org.openstreetmap.josm.gui.preferences.projection.ProjectionPreference;35 35 import org.openstreetmap.josm.tools.Logging; 36 36 import org.openstreetmap.josm.tools.Pair; … … 65 65 public GeoJSONWriter(DataSet ds) { 66 66 this.data = ds; 67 this.projection = Projection Preference.wgs84.getProjection();67 this.projection = Projections.getProjectionByCode("EPSG:4326"); // WGS 84 68 68 } 69 69 -
trunk/src/org/openstreetmap/josm/io/MultiFetchOverpassObjectReader.java
r10689 r12816 6 6 7 7 import org.openstreetmap.josm.data.osm.OsmPrimitiveType; 8 import org.openstreetmap.josm.gui.preferences.server.OverpassServerPreference;9 8 import org.openstreetmap.josm.tools.Utils; 10 9 … … 25 24 @Override 26 25 protected String getBaseUrl() { 27 return Overpass ServerPreference.getOverpassServer();26 return OverpassDownloadReader.OVERPASS_SERVER.get(); 28 27 } 29 28 -
trunk/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java
r12620 r12816 35 35 import org.openstreetmap.josm.data.osm.SimplePrimitiveId; 36 36 import org.openstreetmap.josm.data.osm.Way; 37 import org.openstreetmap.josm.gui.preferences.server.OverpassServerPreference;38 37 import org.openstreetmap.josm.gui.progress.NullProgressMonitor; 39 38 import org.openstreetmap.josm.gui.progress.ProgressMonitor; … … 87 86 /** 88 87 * Creates a new instance of {@link MultiFetchServerObjectReader} or {@link MultiFetchOverpassObjectReader} 89 * depending on the {@link Overpass ServerPreference#useForMultiFetchpreference}.88 * depending on the {@link OverpassDownloadReader#FOR_MULTI_FETCH preference}. 90 89 * 91 90 * @return a new instance … … 93 92 */ 94 93 public static MultiFetchServerObjectReader create() { 95 return create(Overpass ServerPreference.useForMultiFetch());94 return create(OverpassDownloadReader.FOR_MULTI_FETCH.get()); 96 95 } 97 96 -
trunk/src/org/openstreetmap/josm/io/OverpassDownloadReader.java
r12714 r12816 11 11 import java.time.Period; 12 12 import java.time.ZoneOffset; 13 import java.util.Arrays; 13 14 import java.util.EnumMap; 14 15 import java.util.Locale; … … 31 32 import org.openstreetmap.josm.data.osm.OsmPrimitiveType; 32 33 import org.openstreetmap.josm.data.osm.PrimitiveId; 34 import org.openstreetmap.josm.data.preferences.BooleanProperty; 35 import org.openstreetmap.josm.data.preferences.CollectionProperty; 36 import org.openstreetmap.josm.data.preferences.StringProperty; 33 37 import org.openstreetmap.josm.gui.progress.ProgressMonitor; 34 38 import org.openstreetmap.josm.io.NameFinder.SearchResult; … … 44 48 */ 45 49 public class OverpassDownloadReader extends BoundingBoxDownloader { 50 51 /** 52 * Property for current Overpass server. 53 * @since 12816 54 */ 55 public static final StringProperty OVERPASS_SERVER = new StringProperty("download.overpass.server", 56 "https://overpass-api.de/api/"); 57 /** 58 * Property for list of known Overpass servers. 59 * @since 12816 60 */ 61 public static final CollectionProperty OVERPASS_SERVER_HISTORY = new CollectionProperty("download.overpass.servers", 62 Arrays.asList("https://overpass-api.de/api/", "http://overpass.osm.rambler.ru/cgi/")); 63 /** 64 * Property to determine if Overpass API should be used for multi-fetch download. 65 * @since 12816 66 */ 67 public static final BooleanProperty FOR_MULTI_FETCH = new BooleanProperty("download.overpass.for-multi-fetch", false); 46 68 47 69 private static final String DATA_PREFIX = "?data=";
Note:
See TracChangeset
for help on using the changeset viewer.