Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

change net.osmand

Browse source 
git-svn-id: https://osmand.googlecode.com/svn/trunk@455 e29c36b1-1cfa-d876-8d93-3434fc2bb7b8
This commit is contained in:
Victor Shcherb 2010-08-16 22:36:24 +00:00
parent d1866f90ed
commit 50249440e2
62 changed files with 387 additions and 353 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
DataExtractionOSM/build.xml
View file

@ -16,7 +16,7 @@
<delete file="MANIFEST.MF" /> <delete file="MANIFEST.MF" />
<manifest file="MANIFEST.MF"> <manifest file="MANIFEST.MF">
<attribute name="Built-By" value="${user.name}" /> <attribute name="Built-By" value="${user.name}" />
<attribute name="Main-Class" value="com.osmand.swing.OsmExtractionUI" /> <attribute name="Main-Class" value="net.osmand.swing.OsmExtractionUI" />
<attribute name="Class-Path" value="${lib.list}"/> <attribute name="Class-Path" value="${lib.list}"/>
</manifest> </manifest>

2
DataExtractionOSM/logging.properties
View file

@ -2,7 +2,7 @@
handlers=java.util.logging.ConsoleHandler, java.util.logging.FileHandler handlers=java.util.logging.ConsoleHandler, java.util.logging.FileHandler
# Set the default logging level for the logger named com.mycompany # Set the default logging level for the logger named com.mycompany
com.osmand.level = ALL net.osmand.level = ALL
java.util.logging.FileHandler.pattern=%h/Application Data/Osmand/osmand.log java.util.logging.FileHandler.pattern=%h/Application Data/Osmand/osmand.log
java.util.logging.FileHandler.formatter=java.util.logging.SimpleFormatter java.util.logging.FileHandler.formatter=java.util.logging.SimpleFormatter

4
DataExtractionOSM/src/com/osmand/Algoritms.java → DataExtractionOSM/src/net/osmand/Algoritms.java
View file

@ -1,4 +1,4 @@
package com.osmand; package net.osmand;
import java.io.Closeable; import java.io.Closeable;
import java.io.File; import java.io.File;
@ -6,6 +6,8 @@ import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.OutputStream; import java.io.OutputStream;
import net.osmand.LogUtil;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
/** /**

2
DataExtractionOSM/src/com/osmand/Base64.java → DataExtractionOSM/src/net/osmand/Base64.java
View file

@ -1,4 +1,4 @@
package com.osmand; package net.osmand;
/** /**
* @source http://www.javaworld.com/javaworld/javatips/jw-javatip47.html -- 24.11.2008, (mb) * @source http://www.javaworld.com/javaworld/javatips/jw-javatip47.html -- 24.11.2008, (mb)

5
DataExtractionOSM/src/com/osmand/ExceptionHandler.java → DataExtractionOSM/src/net/osmand/ExceptionHandler.java
View file

@ -1,10 +1,11 @@
package com.osmand; package net.osmand;
import javax.swing.JOptionPane; import javax.swing.JOptionPane;
import net.osmand.swing.OsmExtractionUI;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import com.osmand.swing.OsmExtractionUI;
public class ExceptionHandler { public class ExceptionHandler {
private static final Log log = LogUtil.getLog(ExceptionHandler.class); private static final Log log = LogUtil.getLog(ExceptionHandler.class);

2
DataExtractionOSM/src/com/osmand/IProgress.java → DataExtractionOSM/src/net/osmand/IProgress.java
View file

@ -1,4 +1,4 @@
package com.osmand; package net.osmand;
/** /**
* That common interface that could be used by background operations. * That common interface that could be used by background operations.

2
DataExtractionOSM/src/com/osmand/LogUtil.java → DataExtractionOSM/src/net/osmand/LogUtil.java
View file

@ -1,4 +1,4 @@
package com.osmand; package net.osmand;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;

2
DataExtractionOSM/src/com/osmand/Messages.java → DataExtractionOSM/src/net/osmand/Messages.java
View file

@ -1,4 +1,4 @@
package com.osmand; package net.osmand;
import java.util.ResourceBundle; import java.util.ResourceBundle;

13
DataExtractionOSM/src/com/osmand/ToDoConstants.java → DataExtractionOSM/src/net/osmand/ToDoConstants.java
View file

@ -1,4 +1,4 @@
package com.osmand; package net.osmand;
/** /**
@ -17,11 +17,12 @@ public class ToDoConstants {
// highway (?), traffic_calming (?), barrier(?), military(?-), landuse (?), office(?), man_made(?), power(?), // highway (?), traffic_calming (?), barrier(?), military(?-), landuse (?), office(?), man_made(?), power(?),
// railway( station, subway?) - issue 17 // railway( station, subway?) - issue 17
// BUG custom filter : select all/deselect all // BUGS :
// publish on market // ! VELCOM - competition
// rotate map gps without location // ! search poi without gps !
// recalculating route when location is far from ! // rotate map gps without location
// Netherlands indexing albert heijns // recalculating route when location is far from !
// Unscheduled (complex) // Unscheduled (complex)

2
DataExtractionOSM/src/com/osmand/Version.java → DataExtractionOSM/src/net/osmand/Version.java
View file

@ -1,4 +1,4 @@
package com.osmand; package net.osmand;
public class Version { public class Version {

8
DataExtractionOSM/src/com/osmand/data/Amenity.java → DataExtractionOSM/src/net/osmand/data/Amenity.java
View file

@ -1,8 +1,8 @@
package com.osmand.data; package net.osmand.data;
import com.osmand.osm.Entity; import net.osmand.osm.Entity;
import com.osmand.osm.Relation; import net.osmand.osm.Relation;
import com.osmand.osm.OSMSettings.OSMTagKey; import net.osmand.osm.OSMSettings.OSMTagKey;
public class Amenity extends MapObject { public class Amenity extends MapObject {

5
DataExtractionOSM/src/com/osmand/data/AmenityType.java → DataExtractionOSM/src/net/osmand/data/AmenityType.java
View file

@ -1,11 +1,12 @@
package com.osmand.data; package net.osmand.data;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import com.osmand.Messages; import net.osmand.Messages;
// http://wiki.openstreetmap.org/wiki/Amenity // http://wiki.openstreetmap.org/wiki/Amenity
// POI tags : amenity, leisure, shop, sport, tourism, historic; accessories (internet-access), natural ? // POI tags : amenity, leisure, shop, sport, tourism, historic; accessories (internet-access), natural ?

6
DataExtractionOSM/src/com/osmand/data/Building.java → DataExtractionOSM/src/net/osmand/data/Building.java
View file

@ -1,7 +1,7 @@
package com.osmand.data; package net.osmand.data;
import com.osmand.osm.Entity; import net.osmand.osm.Entity;
import com.osmand.osm.OSMSettings.OSMTagKey; import net.osmand.osm.OSMSettings.OSMTagKey;
public class Building extends MapObject { public class Building extends MapObject {

11
DataExtractionOSM/src/com/osmand/data/City.java → DataExtractionOSM/src/net/osmand/data/City.java
View file

@ -1,4 +1,4 @@
package com.osmand.data; package net.osmand.data;
import java.text.Collator; import java.text.Collator;
import java.util.ArrayList; import java.util.ArrayList;
@ -6,10 +6,11 @@ import java.util.Collection;
import java.util.Map; import java.util.Map;
import java.util.TreeMap; import java.util.TreeMap;
import com.osmand.Algoritms; import net.osmand.Algoritms;
import com.osmand.osm.Entity; import net.osmand.osm.Entity;
import com.osmand.osm.Node; import net.osmand.osm.Node;
import com.osmand.osm.OSMSettings.OSMTagKey; import net.osmand.osm.OSMSettings.OSMTagKey;
public class City extends MapObject { public class City extends MapObject {

5
DataExtractionOSM/src/com/osmand/data/DataTileManager.java → DataExtractionOSM/src/net/osmand/data/DataTileManager.java
View file

@ -1,4 +1,4 @@
package com.osmand.data; package net.osmand.data;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
@ -6,7 +6,8 @@ import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import com.osmand.osm.MapUtils; import net.osmand.osm.MapUtils;
/** /**
* *

15
DataExtractionOSM/src/com/osmand/data/MapObject.java → DataExtractionOSM/src/net/osmand/data/MapObject.java
View file

@ -1,13 +1,14 @@
package com.osmand.data; package net.osmand.data;
import java.text.Collator; import java.text.Collator;
import com.osmand.osm.Entity; import net.osmand.osm.Entity;
import com.osmand.osm.LatLon; import net.osmand.osm.LatLon;
import com.osmand.osm.MapUtils; import net.osmand.osm.MapUtils;
import com.osmand.osm.Entity.EntityId; import net.osmand.osm.Entity.EntityId;
import com.osmand.osm.Entity.EntityType; import net.osmand.osm.Entity.EntityType;
import com.osmand.osm.OSMSettings.OSMTagKey; import net.osmand.osm.OSMSettings.OSMTagKey;
public abstract class MapObject implements Comparable<MapObject> { public abstract class MapObject implements Comparable<MapObject> {

2
DataExtractionOSM/src/com/osmand/data/PostCode.java → DataExtractionOSM/src/net/osmand/data/PostCode.java
View file

@ -1,4 +1,4 @@
package com.osmand.data; package net.osmand.data;
import java.text.Collator; import java.text.Collator;
import java.util.Collection; import java.util.Collection;

15
DataExtractionOSM/src/com/osmand/data/Region.java → DataExtractionOSM/src/net/osmand/data/Region.java
View file

@ -1,4 +1,4 @@
package com.osmand.data; package net.osmand.data;
import java.text.Collator; import java.text.Collator;
import java.util.ArrayList; import java.util.ArrayList;
@ -10,12 +10,13 @@ import java.util.LinkedHashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import com.osmand.Algoritms; import net.osmand.Algoritms;
import com.osmand.data.City.CityType; import net.osmand.data.City.CityType;
import com.osmand.osm.LatLon; import net.osmand.osm.LatLon;
import com.osmand.osm.MapUtils; import net.osmand.osm.MapUtils;
import com.osmand.osm.Node; import net.osmand.osm.Node;
import com.osmand.osm.io.OsmBaseStorage; import net.osmand.osm.io.OsmBaseStorage;
public class Region extends MapObject { public class Region extends MapObject {
private DataTileManager<Amenity> amenities = new DataTileManager<Amenity>(); private DataTileManager<Amenity> amenities = new DataTileManager<Amenity>();

17
DataExtractionOSM/src/com/osmand/data/Street.java → DataExtractionOSM/src/net/osmand/data/Street.java
View file

@ -1,17 +1,18 @@
package com.osmand.data; package net.osmand.data;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.Comparator; import java.util.Comparator;
import java.util.List; import java.util.List;
import com.osmand.Algoritms; import net.osmand.Algoritms;
import com.osmand.osm.Entity; import net.osmand.osm.Entity;
import com.osmand.osm.LatLon; import net.osmand.osm.LatLon;
import com.osmand.osm.MapUtils; import net.osmand.osm.MapUtils;
import com.osmand.osm.Node; import net.osmand.osm.Node;
import com.osmand.osm.Way; import net.osmand.osm.Way;
import com.osmand.osm.OSMSettings.OSMTagKey; import net.osmand.osm.OSMSettings.OSMTagKey;
public class Street extends MapObject { public class Street extends MapObject {

9
DataExtractionOSM/src/com/osmand/data/TransportRoute.java → DataExtractionOSM/src/net/osmand/data/TransportRoute.java
View file

@ -1,12 +1,13 @@
package com.osmand.data; package net.osmand.data;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import com.osmand.osm.MapUtils; import net.osmand.osm.MapUtils;
import com.osmand.osm.Relation; import net.osmand.osm.Relation;
import com.osmand.osm.Way; import net.osmand.osm.Way;
public class TransportRoute extends MapObject { public class TransportRoute extends MapObject {
private List<Way> ways; private List<Way> ways;

4
DataExtractionOSM/src/com/osmand/data/TransportStop.java → DataExtractionOSM/src/net/osmand/data/TransportStop.java
View file

@ -1,6 +1,6 @@
package com.osmand.data; package net.osmand.data;
import com.osmand.osm.Entity; import net.osmand.osm.Entity;
public class TransportStop extends MapObject { public class TransportStop extends MapObject {

19
DataExtractionOSM/src/com/osmand/data/index/DataIndexReader.java → DataExtractionOSM/src/net/osmand/data/index/DataIndexReader.java
View file

@ -1,4 +1,4 @@
package com.osmand.data.index; package net.osmand.data.index;
import java.io.File; import java.io.File;
import java.sql.Connection; import java.sql.Connection;
@ -9,16 +9,17 @@ import java.sql.Statement;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import net.osmand.LogUtil;
import net.osmand.data.Building;
import net.osmand.data.City;
import net.osmand.data.Street;
import net.osmand.data.City.CityType;
import net.osmand.data.index.IndexConstants.IndexBuildingTable;
import net.osmand.data.index.IndexConstants.IndexCityTable;
import net.osmand.data.index.IndexConstants.IndexStreetTable;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import com.osmand.LogUtil;
import com.osmand.data.Building;
import com.osmand.data.City;
import com.osmand.data.Street;
import com.osmand.data.City.CityType;
import com.osmand.data.index.IndexConstants.IndexBuildingTable;
import com.osmand.data.index.IndexConstants.IndexCityTable;
import com.osmand.data.index.IndexConstants.IndexStreetTable;
public class DataIndexReader { public class DataIndexReader {
private static final Log log = LogUtil.getLog(DataIndexReader.class); private static final Log log = LogUtil.getLog(DataIndexReader.class);

43
DataExtractionOSM/src/com/osmand/data/index/DataIndexWriter.java → DataExtractionOSM/src/net/osmand/data/index/DataIndexWriter.java
View file

@ -1,4 +1,4 @@
package com.osmand.data.index; package net.osmand.data.index;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
@ -14,28 +14,29 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import net.osmand.LogUtil;
import net.osmand.data.Amenity;
import net.osmand.data.AmenityType;
import net.osmand.data.Building;
import net.osmand.data.City;
import net.osmand.data.Region;
import net.osmand.data.Street;
import net.osmand.data.TransportRoute;
import net.osmand.data.TransportStop;
import net.osmand.data.City.CityType;
import net.osmand.data.index.IndexConstants.IndexBuildingTable;
import net.osmand.data.index.IndexConstants.IndexCityTable;
import net.osmand.data.index.IndexConstants.IndexPoiTable;
import net.osmand.data.index.IndexConstants.IndexStreetNodeTable;
import net.osmand.data.index.IndexConstants.IndexStreetTable;
import net.osmand.data.index.IndexConstants.IndexTransportRoute;
import net.osmand.data.index.IndexConstants.IndexTransportRouteStop;
import net.osmand.data.index.IndexConstants.IndexTransportStop;
import net.osmand.osm.Node;
import net.osmand.osm.Way;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import com.osmand.LogUtil;
import com.osmand.data.Amenity;
import com.osmand.data.AmenityType;
import com.osmand.data.Building;
import com.osmand.data.City;
import com.osmand.data.Region;
import com.osmand.data.Street;
import com.osmand.data.TransportRoute;
import com.osmand.data.TransportStop;
import com.osmand.data.City.CityType;
import com.osmand.data.index.IndexConstants.IndexBuildingTable;
import com.osmand.data.index.IndexConstants.IndexCityTable;
import com.osmand.data.index.IndexConstants.IndexPoiTable;
import com.osmand.data.index.IndexConstants.IndexStreetNodeTable;
import com.osmand.data.index.IndexConstants.IndexStreetTable;
import com.osmand.data.index.IndexConstants.IndexTransportRoute;
import com.osmand.data.index.IndexConstants.IndexTransportRouteStop;
import com.osmand.data.index.IndexConstants.IndexTransportStop;
import com.osmand.osm.Node;
import com.osmand.osm.Way;
public class DataIndexWriter { public class DataIndexWriter {

5
DataExtractionOSM/src/com/osmand/data/index/DownloaderIndexFromGoogleCode.java → DataExtractionOSM/src/net/osmand/data/index/DownloaderIndexFromGoogleCode.java
View file

@ -1,4 +1,4 @@
package com.osmand.data.index; package net.osmand.data.index;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.IOException; import java.io.IOException;
@ -9,9 +9,10 @@ import java.net.URL;
import java.util.Map; import java.util.Map;
import java.util.TreeMap; import java.util.TreeMap;
import net.osmand.LogUtil;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import com.osmand.LogUtil;
public class DownloaderIndexFromGoogleCode { public class DownloaderIndexFromGoogleCode {

7
DataExtractionOSM/src/com/osmand/data/index/GoogleCodeUploadIndex.java → DataExtractionOSM/src/net/osmand/data/index/GoogleCodeUploadIndex.java
View file

@ -3,7 +3,7 @@
* *
* This code belongs to Jonathan Fuerth * This code belongs to Jonathan Fuerth
*/ */
package com.osmand.data.index; package net.osmand.data.index;
import java.io.BufferedInputStream; import java.io.BufferedInputStream;
import java.io.FileInputStream; import java.io.FileInputStream;
@ -14,10 +14,11 @@ import java.net.HttpURLConnection;
import java.net.MalformedURLException; import java.net.MalformedURLException;
import java.net.URL; import java.net.URL;
import net.osmand.Base64;
import net.osmand.LogUtil;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import com.osmand.Base64;
import com.osmand.LogUtil;
/** /**

18
DataExtractionOSM/src/com/osmand/data/index/IndexBatchCreator.java → DataExtractionOSM/src/net/osmand/data/index/IndexBatchCreator.java
View file

@ -1,4 +1,4 @@
package com.osmand.data.index; package net.osmand.data.index;
import java.io.File; import java.io.File;
import java.io.FileInputStream; import java.io.FileInputStream;
@ -16,14 +16,15 @@ import java.util.Set;
import java.util.zip.ZipEntry; import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream; import java.util.zip.ZipOutputStream;
import net.osmand.Algoritms;
import net.osmand.LogUtil;
import net.osmand.data.Region;
import net.osmand.data.preparation.DataExtraction;
import net.osmand.data.preparation.IndexCreator;
import net.osmand.impl.ConsoleProgressImplementation;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import com.osmand.Algoritms;
import com.osmand.LogUtil;
import com.osmand.data.Region;
import com.osmand.data.preparation.DataExtraction;
import com.osmand.data.preparation.IndexCreator;
import com.osmand.impl.ConsoleProgressImplementation;
public class IndexBatchCreator { public class IndexBatchCreator {
// config params // config params
@ -83,7 +84,8 @@ public class IndexBatchCreator {
// "Maryland", "Massachusetts", "Michigan", // "Maryland", "Massachusetts", "Michigan",
// TODO // TODO
// "Minnesota", "Mississippi", "Missouri", // "Minnesota", "Mississippi", "Missouri",
// "Montana", "Nebraska", "Nevada", "New_Hampshire", "New_Jersey", "New_Mexico", // "Montana",
// "Nebraska", "Nevada", "New_Hampshire", "New_Jersey", "New_Mexico",
// "New_York", "North_Carolina", "North_Dakota", "Ohio", "Oklahoma", "Oregon", // "New_York", "North_Carolina", "North_Dakota", "Ohio", "Oklahoma", "Oregon",
// "Pennsylvania", "Rhode Island", "South Carolina", "South Dakota", "Tennessee", // "Pennsylvania", "Rhode Island", "South Carolina", "South Dakota", "Tennessee",
// "Texas", "Utah", "Vermont", "Virginia", "Washington", "West_Virginia", "Wisconsin", "Wyoming", // "Texas", "Utah", "Vermont", "Virginia", "Washington", "West_Virginia", "Wisconsin", "Wyoming",

2
DataExtractionOSM/src/com/osmand/data/index/IndexConstants.java → DataExtractionOSM/src/net/osmand/data/index/IndexConstants.java
View file

@ -1,4 +1,4 @@
package com.osmand.data.index; package net.osmand.data.index;
public class IndexConstants { public class IndexConstants {

54
DataExtractionOSM/src/com/osmand/data/preparation/DataExtraction.java → DataExtractionOSM/src/net/osmand/data/preparation/DataExtraction.java
View file

@ -1,4 +1,4 @@
package com.osmand.data.preparation; package net.osmand.data.preparation;
import java.io.File; import java.io.File;
import java.io.FileInputStream; import java.io.FileInputStream;
@ -23,6 +23,32 @@ import java.util.Map.Entry;
import javax.xml.parsers.ParserConfigurationException; import javax.xml.parsers.ParserConfigurationException;
import net.osmand.Algoritms;
import net.osmand.IProgress;
import net.osmand.data.Amenity;
import net.osmand.data.Building;
import net.osmand.data.City;
import net.osmand.data.DataTileManager;
import net.osmand.data.MapObject;
import net.osmand.data.Region;
import net.osmand.data.Street;
import net.osmand.data.TransportRoute;
import net.osmand.data.TransportStop;
import net.osmand.data.City.CityType;
import net.osmand.data.index.IndexConstants;
import net.osmand.impl.ConsoleProgressImplementation;
import net.osmand.osm.Entity;
import net.osmand.osm.LatLon;
import net.osmand.osm.MapUtils;
import net.osmand.osm.Node;
import net.osmand.osm.Relation;
import net.osmand.osm.Way;
import net.osmand.osm.Entity.EntityId;
import net.osmand.osm.Entity.EntityType;
import net.osmand.osm.OSMSettings.OSMTagKey;
import net.osmand.osm.io.IOsmStorageFilter;
import net.osmand.osm.io.OsmBaseStorage;
import net.osmand.swing.DataExtractionSettings;
import net.sf.junidecode.Junidecode; import net.sf.junidecode.Junidecode;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
@ -30,32 +56,6 @@ import org.apache.commons.logging.LogFactory;
import org.apache.tools.bzip2.CBZip2InputStream; import org.apache.tools.bzip2.CBZip2InputStream;
import org.xml.sax.SAXException; import org.xml.sax.SAXException;
import com.osmand.Algoritms;
import com.osmand.IProgress;
import com.osmand.data.Amenity;
import com.osmand.data.Building;
import com.osmand.data.City;
import com.osmand.data.DataTileManager;
import com.osmand.data.MapObject;
import com.osmand.data.Region;
import com.osmand.data.Street;
import com.osmand.data.TransportRoute;
import com.osmand.data.TransportStop;
import com.osmand.data.City.CityType;
import com.osmand.data.index.IndexConstants;
import com.osmand.impl.ConsoleProgressImplementation;
import com.osmand.osm.Entity;
import com.osmand.osm.LatLon;
import com.osmand.osm.MapUtils;
import com.osmand.osm.Node;
import com.osmand.osm.Relation;
import com.osmand.osm.Way;
import com.osmand.osm.Entity.EntityId;
import com.osmand.osm.Entity.EntityType;
import com.osmand.osm.OSMSettings.OSMTagKey;
import com.osmand.osm.io.IOsmStorageFilter;
import com.osmand.osm.io.OsmBaseStorage;
import com.osmand.swing.DataExtractionSettings;
/** /**

65
DataExtractionOSM/src/com/osmand/data/preparation/IndexCreator.java → DataExtractionOSM/src/net/osmand/data/preparation/IndexCreator.java
View file

@ -1,4 +1,4 @@
package com.osmand.data.preparation; package net.osmand.data.preparation;
import java.io.File; import java.io.File;
import java.io.FileInputStream; import java.io.FileInputStream;
@ -22,6 +22,37 @@ import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.Map.Entry; import java.util.Map.Entry;
import net.osmand.Algoritms;
import net.osmand.IProgress;
import net.osmand.data.Amenity;
import net.osmand.data.Building;
import net.osmand.data.City;
import net.osmand.data.DataTileManager;
import net.osmand.data.MapObject;
import net.osmand.data.TransportRoute;
import net.osmand.data.TransportStop;
import net.osmand.data.City.CityType;
import net.osmand.data.index.DataIndexWriter;
import net.osmand.data.index.IndexConstants;
import net.osmand.data.index.IndexConstants.IndexBuildingTable;
import net.osmand.data.index.IndexConstants.IndexCityTable;
import net.osmand.data.index.IndexConstants.IndexStreetNodeTable;
import net.osmand.data.index.IndexConstants.IndexStreetTable;
import net.osmand.data.index.IndexConstants.IndexTransportRoute;
import net.osmand.data.index.IndexConstants.IndexTransportRouteStop;
import net.osmand.data.index.IndexConstants.IndexTransportStop;
import net.osmand.osm.Entity;
import net.osmand.osm.LatLon;
import net.osmand.osm.MapUtils;
import net.osmand.osm.Node;
import net.osmand.osm.Relation;
import net.osmand.osm.Way;
import net.osmand.osm.Entity.EntityId;
import net.osmand.osm.Entity.EntityType;
import net.osmand.osm.OSMSettings.OSMTagKey;
import net.osmand.osm.io.IOsmStorageFilter;
import net.osmand.osm.io.OsmBaseStorage;
import net.osmand.swing.DataExtractionSettings;
import net.sf.junidecode.Junidecode; import net.sf.junidecode.Junidecode;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
@ -29,38 +60,6 @@ import org.apache.commons.logging.LogFactory;
import org.apache.tools.bzip2.CBZip2InputStream; import org.apache.tools.bzip2.CBZip2InputStream;
import org.xml.sax.SAXException; import org.xml.sax.SAXException;
import com.osmand.Algoritms;
import com.osmand.IProgress;
import com.osmand.data.Amenity;
import com.osmand.data.Building;
import com.osmand.data.City;
import com.osmand.data.DataTileManager;
import com.osmand.data.MapObject;
import com.osmand.data.TransportRoute;
import com.osmand.data.TransportStop;
import com.osmand.data.City.CityType;
import com.osmand.data.index.DataIndexWriter;
import com.osmand.data.index.IndexConstants;
import com.osmand.data.index.IndexConstants.IndexBuildingTable;
import com.osmand.data.index.IndexConstants.IndexCityTable;
import com.osmand.data.index.IndexConstants.IndexStreetNodeTable;
import com.osmand.data.index.IndexConstants.IndexStreetTable;
import com.osmand.data.index.IndexConstants.IndexTransportRoute;
import com.osmand.data.index.IndexConstants.IndexTransportRouteStop;
import com.osmand.data.index.IndexConstants.IndexTransportStop;
import com.osmand.impl.ConsoleProgressImplementation;
import com.osmand.osm.Entity;
import com.osmand.osm.LatLon;
import com.osmand.osm.MapUtils;
import com.osmand.osm.Node;
import com.osmand.osm.Relation;
import com.osmand.osm.Way;
import com.osmand.osm.Entity.EntityId;
import com.osmand.osm.Entity.EntityType;
import com.osmand.osm.OSMSettings.OSMTagKey;
import com.osmand.osm.io.IOsmStorageFilter;
import com.osmand.osm.io.OsmBaseStorage;
import com.osmand.swing.DataExtractionSettings;
/** /**
* That data extraction has aim, * That data extraction has aim,

9
DataExtractionOSM/src/com/osmand/data/preparation/MapTileDownloader.java → DataExtractionOSM/src/net/osmand/data/preparation/MapTileDownloader.java
View file

@ -1,4 +1,4 @@
package com.osmand.data.preparation; package net.osmand.data.preparation;
import java.io.BufferedInputStream; import java.io.BufferedInputStream;
import java.io.File; import java.io.File;
@ -16,11 +16,12 @@ import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import net.osmand.Algoritms;
import net.osmand.LogUtil;
import net.osmand.Version;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import com.osmand.Algoritms;
import com.osmand.LogUtil;
import com.osmand.Version;
public class MapTileDownloader { public class MapTileDownloader {
// Download manager tile settings // Download manager tile settings

9
DataExtractionOSM/src/com/osmand/impl/ConsoleProgressImplementation.java → DataExtractionOSM/src/net/osmand/impl/ConsoleProgressImplementation.java
View file

@ -1,12 +1,13 @@
package com.osmand.impl; package net.osmand.impl;
import java.text.MessageFormat; import java.text.MessageFormat;
import net.osmand.Algoritms;
import net.osmand.IProgress;
import net.osmand.LogUtil;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import com.osmand.Algoritms;
import com.osmand.IProgress;
import com.osmand.LogUtil;
public class ConsoleProgressImplementation implements IProgress { public class ConsoleProgressImplementation implements IProgress {
public static double deltaPercentsToPrint = 3.5; public static double deltaPercentsToPrint = 3.5;

2
DataExtractionOSM/src/com/osmand/map/IMapLocationListener.java → DataExtractionOSM/src/net/osmand/map/IMapLocationListener.java
View file

@ -1,4 +1,4 @@
package com.osmand.map; package net.osmand.map;
public interface IMapLocationListener { public interface IMapLocationListener {
void locationChanged(double newLatitude, double newLongitude, Object source); void locationChanged(double newLatitude, double newLongitude, Object source);

2
DataExtractionOSM/src/com/osmand/map/ITileSource.java → DataExtractionOSM/src/net/osmand/map/ITileSource.java
View file

@ -1,4 +1,4 @@
package com.osmand.map; package net.osmand.map;
public interface ITileSource { public interface ITileSource {

9
DataExtractionOSM/src/com/osmand/map/TileSourceManager.java → DataExtractionOSM/src/net/osmand/map/TileSourceManager.java
View file

@ -1,4 +1,4 @@
package com.osmand.map; package net.osmand.map;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.File; import java.io.File;
@ -9,11 +9,12 @@ import java.text.MessageFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import net.osmand.Algoritms;
import net.osmand.LogUtil;
import net.osmand.osm.MapUtils;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import com.osmand.Algoritms;
import com.osmand.LogUtil;
import com.osmand.osm.MapUtils;
public class TileSourceManager { public class TileSourceManager {

5
DataExtractionOSM/src/com/osmand/osm/Entity.java → DataExtractionOSM/src/net/osmand/osm/Entity.java
View file

@ -1,11 +1,12 @@
package com.osmand.osm; package net.osmand.osm;
import java.util.Collection; import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.Map; import java.util.Map;
import com.osmand.osm.OSMSettings.OSMTagKey; import net.osmand.osm.OSMSettings.OSMTagKey;
public abstract class Entity { public abstract class Entity {
public enum EntityType { public enum EntityType {

2
DataExtractionOSM/src/com/osmand/osm/EntityInfo.java → DataExtractionOSM/src/net/osmand/osm/EntityInfo.java
View file

@ -1,4 +1,4 @@
package com.osmand.osm; package net.osmand.osm;
/** /**
* Additional entity info * Additional entity info

2
DataExtractionOSM/src/com/osmand/osm/LatLon.java → DataExtractionOSM/src/net/osmand/osm/LatLon.java
View file

@ -1,4 +1,4 @@
package com.osmand.osm; package net.osmand.osm;
public class LatLon { public class LatLon {
private final double longitude; private final double longitude;

7
DataExtractionOSM/src/com/osmand/osm/MapUtils.java → DataExtractionOSM/src/net/osmand/osm/MapUtils.java
View file

@ -1,4 +1,4 @@
package com.osmand.osm; package net.osmand.osm;
import java.text.MessageFormat; import java.text.MessageFormat;
import java.util.ArrayList; import java.util.ArrayList;
@ -7,8 +7,9 @@ import java.util.Collections;
import java.util.Comparator; import java.util.Comparator;
import java.util.List; import java.util.List;
import com.osmand.Messages; import net.osmand.Messages;
import com.osmand.data.MapObject; import net.osmand.data.MapObject;
/** /**
* This utility class includes : * This utility class includes :

2
DataExtractionOSM/src/com/osmand/osm/Node.java → DataExtractionOSM/src/net/osmand/osm/Node.java
View file

@ -1,4 +1,4 @@
package com.osmand.osm; package net.osmand.osm;
import java.util.Map; import java.util.Map;

2
DataExtractionOSM/src/com/osmand/osm/OSMSettings.java → DataExtractionOSM/src/net/osmand/osm/OSMSettings.java
View file

@ -1,4 +1,4 @@
package com.osmand.osm; package net.osmand.osm;
public class OSMSettings { public class OSMSettings {

2
DataExtractionOSM/src/com/osmand/osm/OpeningHoursParser.java → DataExtractionOSM/src/net/osmand/osm/OpeningHoursParser.java
View file

@ -1,4 +1,4 @@
package com.osmand.osm; package net.osmand.osm;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Calendar; import java.util.Calendar;

2
DataExtractionOSM/src/com/osmand/osm/Relation.java → DataExtractionOSM/src/net/osmand/osm/Relation.java
View file

@ -1,4 +1,4 @@
package com.osmand.osm; package net.osmand.osm;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;

2
DataExtractionOSM/src/com/osmand/osm/Way.java → DataExtractionOSM/src/net/osmand/osm/Way.java
View file

@ -1,4 +1,4 @@
package com.osmand.osm; package net.osmand.osm;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;

6
DataExtractionOSM/src/com/osmand/osm/io/IOsmStorageFilter.java → DataExtractionOSM/src/net/osmand/osm/io/IOsmStorageFilter.java
View file

@ -1,7 +1,7 @@
package com.osmand.osm.io; package net.osmand.osm.io;
import com.osmand.osm.Entity; import net.osmand.osm.Entity;
import com.osmand.osm.Entity.EntityId; import net.osmand.osm.Entity.EntityId;
public interface IOsmStorageFilter { public interface IOsmStorageFilter {

19
DataExtractionOSM/src/com/osmand/osm/io/OsmBaseStorage.java → DataExtractionOSM/src/net/osmand/osm/io/OsmBaseStorage.java
View file

@ -1,4 +1,4 @@
package com.osmand.osm.io; package net.osmand.osm.io;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
@ -13,18 +13,19 @@ import javax.xml.parsers.ParserConfigurationException;
import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory; import javax.xml.parsers.SAXParserFactory;
import net.osmand.IProgress;
import net.osmand.osm.Entity;
import net.osmand.osm.EntityInfo;
import net.osmand.osm.Node;
import net.osmand.osm.Relation;
import net.osmand.osm.Way;
import net.osmand.osm.Entity.EntityId;
import net.osmand.osm.Entity.EntityType;
import org.xml.sax.Attributes; import org.xml.sax.Attributes;
import org.xml.sax.SAXException; import org.xml.sax.SAXException;
import org.xml.sax.helpers.DefaultHandler; import org.xml.sax.helpers.DefaultHandler;
import com.osmand.IProgress;
import com.osmand.osm.Entity;
import com.osmand.osm.EntityInfo;
import com.osmand.osm.Node;
import com.osmand.osm.Relation;
import com.osmand.osm.Way;
import com.osmand.osm.Entity.EntityId;
import com.osmand.osm.Entity.EntityType;
public class OsmBaseStorage extends DefaultHandler { public class OsmBaseStorage extends DefaultHandler {

8
DataExtractionOSM/src/com/osmand/osm/io/OsmBoundsFilter.java → DataExtractionOSM/src/net/osmand/osm/io/OsmBoundsFilter.java
View file

@ -1,8 +1,8 @@
package com.osmand.osm.io; package net.osmand.osm.io;
import com.osmand.osm.Entity; import net.osmand.osm.Entity;
import com.osmand.osm.Node; import net.osmand.osm.Node;
import com.osmand.osm.Entity.EntityId; import net.osmand.osm.Entity.EntityId;
public class OsmBoundsFilter implements IOsmStorageFilter { public class OsmBoundsFilter implements IOsmStorageFilter {

61
DataExtractionOSM/src/com/osmand/osm/io/OsmStorageWriter.java → DataExtractionOSM/src/net/osmand/osm/io/OsmStorageWriter.java
View file

@ -1,26 +1,26 @@
package com.osmand.osm.io; package net.osmand.osm.io;
import static com.osmand.osm.io.OsmBaseStorage.ATTR_CHANGESET; import static net.osmand.osm.io.OsmBaseStorage.ATTR_CHANGESET;
import static com.osmand.osm.io.OsmBaseStorage.ATTR_ID; import static net.osmand.osm.io.OsmBaseStorage.ATTR_ID;
import static com.osmand.osm.io.OsmBaseStorage.ATTR_K; import static net.osmand.osm.io.OsmBaseStorage.ATTR_K;
import static com.osmand.osm.io.OsmBaseStorage.ATTR_LAT; import static net.osmand.osm.io.OsmBaseStorage.ATTR_LAT;
import static com.osmand.osm.io.OsmBaseStorage.ATTR_LON; import static net.osmand.osm.io.OsmBaseStorage.ATTR_LON;
import static com.osmand.osm.io.OsmBaseStorage.ATTR_REF; import static net.osmand.osm.io.OsmBaseStorage.ATTR_REF;
import static com.osmand.osm.io.OsmBaseStorage.ATTR_ROLE; import static net.osmand.osm.io.OsmBaseStorage.ATTR_ROLE;
import static com.osmand.osm.io.OsmBaseStorage.ATTR_TIMESTAMP; import static net.osmand.osm.io.OsmBaseStorage.ATTR_TIMESTAMP;
import static com.osmand.osm.io.OsmBaseStorage.ATTR_TYPE; import static net.osmand.osm.io.OsmBaseStorage.ATTR_TYPE;
import static com.osmand.osm.io.OsmBaseStorage.ATTR_UID; import static net.osmand.osm.io.OsmBaseStorage.ATTR_UID;
import static com.osmand.osm.io.OsmBaseStorage.ATTR_USER; import static net.osmand.osm.io.OsmBaseStorage.ATTR_USER;
import static com.osmand.osm.io.OsmBaseStorage.ATTR_V; import static net.osmand.osm.io.OsmBaseStorage.ATTR_V;
import static com.osmand.osm.io.OsmBaseStorage.ATTR_VERSION; import static net.osmand.osm.io.OsmBaseStorage.ATTR_VERSION;
import static com.osmand.osm.io.OsmBaseStorage.ATTR_VISIBLE; import static net.osmand.osm.io.OsmBaseStorage.ATTR_VISIBLE;
import static com.osmand.osm.io.OsmBaseStorage.ELEM_MEMBER; import static net.osmand.osm.io.OsmBaseStorage.ELEM_MEMBER;
import static com.osmand.osm.io.OsmBaseStorage.ELEM_ND; import static net.osmand.osm.io.OsmBaseStorage.ELEM_ND;
import static com.osmand.osm.io.OsmBaseStorage.ELEM_NODE; import static net.osmand.osm.io.OsmBaseStorage.ELEM_NODE;
import static com.osmand.osm.io.OsmBaseStorage.ELEM_OSM; import static net.osmand.osm.io.OsmBaseStorage.ELEM_OSM;
import static com.osmand.osm.io.OsmBaseStorage.ELEM_RELATION; import static net.osmand.osm.io.OsmBaseStorage.ELEM_RELATION;
import static com.osmand.osm.io.OsmBaseStorage.ELEM_TAG; import static net.osmand.osm.io.OsmBaseStorage.ELEM_TAG;
import static com.osmand.osm.io.OsmBaseStorage.ELEM_WAY; import static net.osmand.osm.io.OsmBaseStorage.ELEM_WAY;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
@ -34,14 +34,15 @@ import java.util.Map.Entry;
import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamWriter; import javax.xml.stream.XMLStreamWriter;
import com.osmand.Algoritms; import net.osmand.Algoritms;
import com.osmand.data.MapObject; import net.osmand.data.MapObject;
import com.osmand.osm.Entity; import net.osmand.osm.Entity;
import com.osmand.osm.EntityInfo; import net.osmand.osm.EntityInfo;
import com.osmand.osm.Node; import net.osmand.osm.Node;
import com.osmand.osm.Relation; import net.osmand.osm.Relation;
import com.osmand.osm.Way; import net.osmand.osm.Way;
import com.osmand.osm.Entity.EntityId; import net.osmand.osm.Entity.EntityId;
import com.sun.org.apache.xerces.internal.impl.PropertyManager; import com.sun.org.apache.xerces.internal.impl.PropertyManager;
import com.sun.xml.internal.stream.writers.XMLStreamWriterImpl; import com.sun.xml.internal.stream.writers.XMLStreamWriterImpl;

2
DataExtractionOSM/src/com/osmand/osm/io/OsmVersionNotSupported.java → DataExtractionOSM/src/net/osmand/osm/io/OsmVersionNotSupported.java
View file

@ -1,4 +1,4 @@
package com.osmand.osm.io; package net.osmand.osm.io;
import org.xml.sax.SAXException; import org.xml.sax.SAXException;

39
DataExtractionOSM/src/com/osmand/osm/util/AHSupermarketResolver.java → DataExtractionOSM/src/net/osmand/osm/util/AHSupermarketResolver.java
View file

@ -1,4 +1,4 @@
package com.osmand.osm.util; package net.osmand.osm.util;
import java.awt.BorderLayout; import java.awt.BorderLayout;
import java.awt.Color; import java.awt.Color;
@ -24,6 +24,25 @@ import javax.swing.JMenuBar;
import javax.swing.UIManager; import javax.swing.UIManager;
import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamException;
import net.osmand.Algoritms;
import net.osmand.data.DataTileManager;
import net.osmand.impl.ConsoleProgressImplementation;
import net.osmand.osm.Entity;
import net.osmand.osm.EntityInfo;
import net.osmand.osm.LatLon;
import net.osmand.osm.MapUtils;
import net.osmand.osm.Node;
import net.osmand.osm.OpeningHoursParser;
import net.osmand.osm.Entity.EntityId;
import net.osmand.osm.OpeningHoursParser.BasicDayOpeningHourRule;
import net.osmand.osm.OpeningHoursParser.OpeningHoursRule;
import net.osmand.osm.io.IOsmStorageFilter;
import net.osmand.osm.io.OsmBaseStorage;
import net.osmand.osm.io.OsmStorageWriter;
import net.osmand.swing.DataExtractionSettings;
import net.osmand.swing.MapPanel;
import net.osmand.swing.MapPointsLayer;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.json.JSONArray; import org.json.JSONArray;
@ -32,24 +51,6 @@ import org.json.JSONObject;
import org.json.JSONTokener; import org.json.JSONTokener;
import org.xml.sax.SAXException; import org.xml.sax.SAXException;
import com.osmand.Algoritms;
import com.osmand.data.DataTileManager;
import com.osmand.impl.ConsoleProgressImplementation;
import com.osmand.osm.Entity;
import com.osmand.osm.EntityInfo;
import com.osmand.osm.LatLon;
import com.osmand.osm.MapUtils;
import com.osmand.osm.Node;
import com.osmand.osm.OpeningHoursParser;
import com.osmand.osm.Entity.EntityId;
import com.osmand.osm.OpeningHoursParser.BasicDayOpeningHourRule;
import com.osmand.osm.OpeningHoursParser.OpeningHoursRule;
import com.osmand.osm.io.IOsmStorageFilter;
import com.osmand.osm.io.OsmBaseStorage;
import com.osmand.osm.io.OsmStorageWriter;
import com.osmand.swing.DataExtractionSettings;
import com.osmand.swing.MapPanel;
import com.osmand.swing.MapPointsLayer;
/** /**
* Downloads list of Albert Heijn supermarkets and converts them to a map. * Downloads list of Albert Heijn supermarkets and converts them to a map.

37
DataExtractionOSM/src/com/osmand/osm/util/MinskTransReader.java → DataExtractionOSM/src/net/osmand/osm/util/MinskTransReader.java
View file

@ -1,4 +1,4 @@
package com.osmand.osm.util; package net.osmand.osm.util;
import java.awt.BorderLayout; import java.awt.BorderLayout;
import java.awt.Container; import java.awt.Container;
@ -28,25 +28,26 @@ import javax.swing.JMenuBar;
import javax.swing.UIManager; import javax.swing.UIManager;
import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamException;
import net.osmand.data.DataTileManager;
import net.osmand.impl.ConsoleProgressImplementation;
import net.osmand.osm.Entity;
import net.osmand.osm.EntityInfo;
import net.osmand.osm.LatLon;
import net.osmand.osm.MapUtils;
import net.osmand.osm.Node;
import net.osmand.osm.Relation;
import net.osmand.osm.Way;
import net.osmand.osm.Entity.EntityId;
import net.osmand.osm.Entity.EntityType;
import net.osmand.osm.OSMSettings.OSMTagKey;
import net.osmand.osm.io.IOsmStorageFilter;
import net.osmand.osm.io.OsmBaseStorage;
import net.osmand.osm.io.OsmStorageWriter;
import net.osmand.swing.DataExtractionSettings;
import net.osmand.swing.MapPanel;
import org.xml.sax.SAXException; import org.xml.sax.SAXException;
import com.osmand.data.DataTileManager;
import com.osmand.impl.ConsoleProgressImplementation;
import com.osmand.osm.Entity;
import com.osmand.osm.EntityInfo;
import com.osmand.osm.LatLon;
import com.osmand.osm.MapUtils;
import com.osmand.osm.Node;
import com.osmand.osm.Relation;
import com.osmand.osm.Way;
import com.osmand.osm.Entity.EntityId;
import com.osmand.osm.Entity.EntityType;
import com.osmand.osm.OSMSettings.OSMTagKey;
import com.osmand.osm.io.IOsmStorageFilter;
import com.osmand.osm.io.OsmBaseStorage;
import com.osmand.osm.io.OsmStorageWriter;
import com.osmand.swing.DataExtractionSettings;
import com.osmand.swing.MapPanel;
public class MinskTransReader { public class MinskTransReader {
// Routes RouteNum; Authority; City; Transport; Operator; ValidityPeriods; SpecialDates;RouteTag;RouteType;Commercial;RouteName;Weekdays;RouteID;Entry;RouteStops;Datestart // Routes RouteNum; Authority; City; Transport; Operator; ValidityPeriods; SpecialDates;RouteTag;RouteType;Commercial;RouteName;Weekdays;RouteID;Entry;RouteStops;Datestart

5
DataExtractionOSM/src/com/osmand/swing/DataExtractionSettings.java → DataExtractionOSM/src/net/osmand/swing/DataExtractionSettings.java
View file

@ -1,4 +1,4 @@
package com.osmand.swing; package net.osmand.swing;
import java.awt.Rectangle; import java.awt.Rectangle;
import java.io.File; import java.io.File;
@ -6,7 +6,8 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.prefs.Preferences; import java.util.prefs.Preferences;
import com.osmand.osm.LatLon; import net.osmand.osm.LatLon;
public class DataExtractionSettings { public class DataExtractionSettings {

2
DataExtractionOSM/src/com/osmand/swing/MapInformationLayer.java → DataExtractionOSM/src/net/osmand/swing/MapInformationLayer.java
View file

@ -1,4 +1,4 @@
package com.osmand.swing; package net.osmand.swing;
import java.awt.Color; import java.awt.Color;
import java.awt.Component; import java.awt.Component;

29
DataExtractionOSM/src/com/osmand/swing/MapPanel.java → DataExtractionOSM/src/net/osmand/swing/MapPanel.java
View file

@ -1,4 +1,4 @@
package com.osmand.swing; package net.osmand.swing;
import java.awt.BorderLayout; import java.awt.BorderLayout;
import java.awt.Color; import java.awt.Color;
@ -37,21 +37,22 @@ import javax.swing.JPanel;
import javax.swing.JPopupMenu; import javax.swing.JPopupMenu;
import javax.swing.UIManager; import javax.swing.UIManager;
import net.osmand.Algoritms;
import net.osmand.LogUtil;
import net.osmand.data.DataTileManager;
import net.osmand.data.preparation.MapTileDownloader;
import net.osmand.data.preparation.MapTileDownloader.DownloadRequest;
import net.osmand.data.preparation.MapTileDownloader.IMapDownloaderCallback;
import net.osmand.map.IMapLocationListener;
import net.osmand.map.ITileSource;
import net.osmand.map.TileSourceManager;
import net.osmand.map.TileSourceManager.TileSourceTemplate;
import net.osmand.osm.Entity;
import net.osmand.osm.LatLon;
import net.osmand.osm.MapUtils;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import com.osmand.Algoritms;
import com.osmand.LogUtil;
import com.osmand.data.DataTileManager;
import com.osmand.data.preparation.MapTileDownloader;
import com.osmand.data.preparation.MapTileDownloader.DownloadRequest;
import com.osmand.data.preparation.MapTileDownloader.IMapDownloaderCallback;
import com.osmand.map.IMapLocationListener;
import com.osmand.map.ITileSource;
import com.osmand.map.TileSourceManager;
import com.osmand.map.TileSourceManager.TileSourceTemplate;
import com.osmand.osm.Entity;
import com.osmand.osm.LatLon;
import com.osmand.osm.MapUtils;
public class MapPanel extends JPanel implements IMapDownloaderCallback { public class MapPanel extends JPanel implements IMapDownloaderCallback {

2
DataExtractionOSM/src/com/osmand/swing/MapPanelLayer.java → DataExtractionOSM/src/net/osmand/swing/MapPanelLayer.java
View file

@ -1,4 +1,4 @@
package com.osmand.swing; package net.osmand.swing;
import java.awt.Graphics; import java.awt.Graphics;

13
DataExtractionOSM/src/com/osmand/swing/MapPointsLayer.java → DataExtractionOSM/src/net/osmand/swing/MapPointsLayer.java
View file

@ -1,4 +1,4 @@
package com.osmand.swing; package net.osmand.swing;
import java.awt.Color; import java.awt.Color;
import java.awt.Graphics; import java.awt.Graphics;
@ -11,11 +11,12 @@ import java.util.LinkedHashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import com.osmand.data.DataTileManager; import net.osmand.data.DataTileManager;
import com.osmand.osm.Entity; import net.osmand.osm.Entity;
import com.osmand.osm.MapUtils; import net.osmand.osm.MapUtils;
import com.osmand.osm.Node; import net.osmand.osm.Node;
import com.osmand.osm.Way; import net.osmand.osm.Way;
public class MapPointsLayer implements MapPanelLayer { public class MapPointsLayer implements MapPanelLayer {

17
DataExtractionOSM/src/com/osmand/swing/MapRouterLayer.java → DataExtractionOSM/src/net/osmand/swing/MapRouterLayer.java
View file

@ -1,4 +1,4 @@
package com.osmand.swing; package net.osmand.swing;
import java.awt.Color; import java.awt.Color;
import java.awt.Graphics; import java.awt.Graphics;
@ -20,6 +20,12 @@ import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException; import javax.xml.parsers.ParserConfigurationException;
import net.osmand.ExceptionHandler;
import net.osmand.data.DataTileManager;
import net.osmand.osm.LatLon;
import net.osmand.osm.MapUtils;
import net.osmand.osm.Way;
import org.w3c.dom.Document; import org.w3c.dom.Document;
import org.w3c.dom.Element; import org.w3c.dom.Element;
import org.w3c.dom.Node; import org.w3c.dom.Node;
@ -27,11 +33,6 @@ import org.w3c.dom.NodeList;
import org.xml.sax.InputSource; import org.xml.sax.InputSource;
import org.xml.sax.SAXException; import org.xml.sax.SAXException;
import com.osmand.ExceptionHandler;
import com.osmand.data.DataTileManager;
import com.osmand.osm.LatLon;
import com.osmand.osm.MapUtils;
import com.osmand.osm.Way;
public class MapRouterLayer implements MapPanelLayer { public class MapRouterLayer implements MapPanelLayer {
@ -172,7 +173,7 @@ public class MapRouterLayer implements MapPanelLayer {
try { try {
double lon = Double.parseDouble(coordinate.substring(0, s)); double lon = Double.parseDouble(coordinate.substring(0, s));
double lat = Double.parseDouble(coordinate.substring(s + 1)); double lat = Double.parseDouble(coordinate.substring(s + 1));
w.addNode(new com.osmand.osm.Node(lat, lon, -1)); w.addNode(new net.osmand.osm.Node(lat, lon, -1));
} catch (NumberFormatException e) { } catch (NumberFormatException e) {
} }
} }
@ -239,7 +240,7 @@ public class MapRouterLayer implements MapPanelLayer {
try { try {
double lon = Double.parseDouble(item.getAttribute("lon")); double lon = Double.parseDouble(item.getAttribute("lon"));
double lat = Double.parseDouble(item.getAttribute("lat")); double lat = Double.parseDouble(item.getAttribute("lat"));
w.addNode(new com.osmand.osm.Node(lat, lon, -1)); w.addNode(new net.osmand.osm.Node(lat, lon, -1));
} catch (NumberFormatException e) { } catch (NumberFormatException e) {
} }
} }

7
DataExtractionOSM/src/com/osmand/swing/NewTileSourceDialog.java → DataExtractionOSM/src/net/osmand/swing/NewTileSourceDialog.java
View file

@ -1,4 +1,4 @@
package com.osmand.swing; package net.osmand.swing;
import java.awt.Component; import java.awt.Component;
import java.awt.Dimension; import java.awt.Dimension;
@ -22,10 +22,11 @@ import javax.swing.JOptionPane;
import javax.swing.JPanel; import javax.swing.JPanel;
import javax.swing.JTextField; import javax.swing.JTextField;
import net.osmand.Algoritms;
import net.osmand.LogUtil;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import com.osmand.Algoritms;
import com.osmand.LogUtil;
public class NewTileSourceDialog extends JDialog { public class NewTileSourceDialog extends JDialog {

2
DataExtractionOSM/src/com/osmand/swing/OsmExtractionPreferencesDialog.java → DataExtractionOSM/src/net/osmand/swing/OsmExtractionPreferencesDialog.java
View file

@ -1,4 +1,4 @@
package com.osmand.swing; package net.osmand.swing;
import java.awt.Component; import java.awt.Component;
import java.awt.Dimension; import java.awt.Dimension;

55
DataExtractionOSM/src/com/osmand/swing/OsmExtractionUI.java → DataExtractionOSM/src/net/osmand/swing/OsmExtractionUI.java
View file

@ -1,4 +1,4 @@
package com.osmand.swing; package net.osmand.swing;
import java.awt.BorderLayout; import java.awt.BorderLayout;
import java.awt.Container; import java.awt.Container;
@ -57,37 +57,38 @@ import javax.swing.tree.TreeCellEditor;
import javax.swing.tree.TreePath; import javax.swing.tree.TreePath;
import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamException;
import net.osmand.Algoritms;
import net.osmand.ExceptionHandler;
import net.osmand.data.Amenity;
import net.osmand.data.AmenityType;
import net.osmand.data.Building;
import net.osmand.data.City;
import net.osmand.data.DataTileManager;
import net.osmand.data.MapObject;
import net.osmand.data.Region;
import net.osmand.data.Street;
import net.osmand.data.TransportRoute;
import net.osmand.data.TransportStop;
import net.osmand.data.City.CityType;
import net.osmand.data.index.DataIndexWriter;
import net.osmand.data.preparation.DataExtraction;
import net.osmand.map.IMapLocationListener;
import net.osmand.map.ITileSource;
import net.osmand.osm.Entity;
import net.osmand.osm.LatLon;
import net.osmand.osm.MapUtils;
import net.osmand.osm.Node;
import net.osmand.osm.Way;
import net.osmand.osm.io.IOsmStorageFilter;
import net.osmand.osm.io.OsmBoundsFilter;
import net.osmand.osm.io.OsmStorageWriter;
import net.osmand.swing.MapPanel.MapSelectionArea;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.apache.tools.bzip2.CBZip2OutputStream; import org.apache.tools.bzip2.CBZip2OutputStream;
import org.xml.sax.SAXException; import org.xml.sax.SAXException;
import com.osmand.Algoritms;
import com.osmand.ExceptionHandler;
import com.osmand.data.Amenity;
import com.osmand.data.AmenityType;
import com.osmand.data.Building;
import com.osmand.data.City;
import com.osmand.data.DataTileManager;
import com.osmand.data.MapObject;
import com.osmand.data.Region;
import com.osmand.data.Street;
import com.osmand.data.TransportRoute;
import com.osmand.data.TransportStop;
import com.osmand.data.City.CityType;
import com.osmand.data.index.DataIndexWriter;
import com.osmand.data.preparation.DataExtraction;
import com.osmand.map.IMapLocationListener;
import com.osmand.map.ITileSource;
import com.osmand.osm.Entity;
import com.osmand.osm.LatLon;
import com.osmand.osm.MapUtils;
import com.osmand.osm.Node;
import com.osmand.osm.Way;
import com.osmand.osm.io.IOsmStorageFilter;
import com.osmand.osm.io.OsmBoundsFilter;
import com.osmand.osm.io.OsmStorageWriter;
import com.osmand.swing.MapPanel.MapSelectionArea;
public class OsmExtractionUI implements IMapLocationListener { public class OsmExtractionUI implements IMapLocationListener {

7
DataExtractionOSM/src/com/osmand/swing/ProgressDialog.java → DataExtractionOSM/src/net/osmand/swing/ProgressDialog.java
View file

@ -1,4 +1,4 @@
package com.osmand.swing; package net.osmand.swing;
import java.awt.BorderLayout; import java.awt.BorderLayout;
import java.awt.Component; import java.awt.Component;
@ -12,10 +12,11 @@ import javax.swing.JPanel;
import javax.swing.JProgressBar; import javax.swing.JProgressBar;
import javax.swing.SwingUtilities; import javax.swing.SwingUtilities;
import net.osmand.IProgress;
import net.osmand.LogUtil;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import com.osmand.IProgress;
import com.osmand.LogUtil;
public class ProgressDialog extends JDialog implements IProgress { public class ProgressDialog extends JDialog implements IProgress {

9
DataExtractionOSM/src/com/osmand/swing/SQLiteBigPlanetIndex.java → DataExtractionOSM/src/net/osmand/swing/SQLiteBigPlanetIndex.java
View file

@ -1,4 +1,4 @@
package com.osmand.swing; package net.osmand.swing;
import java.io.File; import java.io.File;
import java.io.FileInputStream; import java.io.FileInputStream;
@ -9,11 +9,12 @@ import java.sql.PreparedStatement;
import java.sql.SQLException; import java.sql.SQLException;
import java.sql.Statement; import java.sql.Statement;
import net.osmand.LogUtil;
import net.osmand.map.ITileSource;
import net.osmand.map.TileSourceManager.TileSourceTemplate;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import com.osmand.LogUtil;
import com.osmand.map.ITileSource;
import com.osmand.map.TileSourceManager.TileSourceTemplate;
public class SQLiteBigPlanetIndex { public class SQLiteBigPlanetIndex {
private static final Log log = LogUtil.getLog(SQLiteBigPlanetIndex.class); private static final Log log = LogUtil.getLog(SQLiteBigPlanetIndex.class);

17
DataExtractionOSM/src/com/osmand/swing/TileBundleDownloadDialog.java → DataExtractionOSM/src/net/osmand/swing/TileBundleDownloadDialog.java
View file

@ -1,4 +1,4 @@
package com.osmand.swing; package net.osmand.swing;
import java.awt.BorderLayout; import java.awt.BorderLayout;
import java.awt.Component; import java.awt.Component;
@ -24,13 +24,14 @@ import javax.swing.SpinnerNumberModel;
import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener; import javax.swing.event.ChangeListener;
import com.osmand.ExceptionHandler; import net.osmand.ExceptionHandler;
import com.osmand.data.preparation.MapTileDownloader; import net.osmand.data.preparation.MapTileDownloader;
import com.osmand.data.preparation.MapTileDownloader.DownloadRequest; import net.osmand.data.preparation.MapTileDownloader.DownloadRequest;
import com.osmand.data.preparation.MapTileDownloader.IMapDownloaderCallback; import net.osmand.data.preparation.MapTileDownloader.IMapDownloaderCallback;
import com.osmand.map.ITileSource; import net.osmand.map.ITileSource;
import com.osmand.osm.MapUtils; import net.osmand.osm.MapUtils;
import com.osmand.swing.MapPanel.MapSelectionArea; import net.osmand.swing.MapPanel.MapSelectionArea;
public class TileBundleDownloadDialog extends JDialog { public class TileBundleDownloadDialog extends JDialog {