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

implement geocache type for amenity and change geocache rendering

Browse source 
fix issue 265

git-svn-id: https://osmand.googlecode.com/svn/trunk@822 e29c36b1-1cfa-d876-8d93-3434fc2bb7b8
This commit is contained in:
Olga.shcherb 2010-12-16 09:55:10 +00:00
parent 6729419acb
commit caa6b1dd58
7 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
DataExtractionOSM/src/net/osmand/data/AmenityType.java
View file

@ -31,7 +31,7 @@ public enum AmenityType {
EMERGENCY("amenity_type_emergency", "emergency"), // [TAG] emergency //$NON-NLS-1$ //$NON-NLS-2$
MILITARY("amenity_type_military", "military"), // [TAG] military //$NON-NLS-1$ //$NON-NLS-2$
ADMINISTRATIVE("amenity_type_administrative", "administrative"), // [TAG] administrative //$NON-NLS-1$ //$NON-NLS-2$
GEOCACHE("amenity_type_geocache", "geocache"),
GEOCACHE("amenity_type_geocache", "geocache"), //$NON-NLS-1$//$NON-NLS-2$
OTHER("amenity_type_other", "amenity"), // grave-yard, police, post-office [+Internet_access] //$NON-NLS-1$ //$NON-NLS-2$
;

4
DataExtractionOSM/src/net/osmand/osm/MapRenderingTypes.java
View file

@ -661,7 +661,7 @@ public class MapRenderingTypes {
if (val != null) {
maxzoom = Integer.parseInt(val);
}
String nameNullTag = attributes.getValue("nameNullTag");
String nameNullTag = attributes.getValue("nameNullTag"); //$NON-NLS-1$
String tag = attributes.getValue("tag"); //$NON-NLS-1$
val = attributes.getValue("value"); //$NON-NLS-1$
@ -924,6 +924,8 @@ public class MapRenderingTypes {
amenityTagValToType.put("amenity"+TAG_DELIMETER+"sauna", AmenityType.ENTERTAINMENT); //$NON-NLS-1$//$NON-NLS-2$
amenityTagValToType.put("amenity"+TAG_DELIMETER+"brothel", AmenityType.ENTERTAINMENT); //$NON-NLS-1$//$NON-NLS-2$
amenityTagValToType.put("geocache", AmenityType.GEOCACHE); //$NON-NLS-1$
amenityTagValToType.put("amenity", AmenityType.OTHER); //$NON-NLS-1$
amenityTagValToType.put("place", AmenityType.ADMINISTRATIVE); //$NON-NLS-1$
amenityTagValToType.put("sport", AmenityType.SPORT); //$NON-NLS-1$

5
DataExtractionOSM/src/net/osmand/osm/rendering_types.xml
View file

@ -504,6 +504,11 @@
<subtype id="9" building="true" tag="amenity" value="theatre" minzoom="15" />
<subtype id="10" point="true" tag="amenity" value="sauna" minzoom="15" />
<subtype id="11" building="true" tag="amenity" value="brothel" minzoom="15" />
<subtype id="33" point="true" tag="geocache" minzoom="15" />
<subtype id="34" point="true" tag="geocache" value="found" minzoom="15" />
<subtype id="35" point="true" tag="geocache" value="not found" minzoom="15" />
</type>

2
DataExtractionOSM/src/net/osmand/render/default.render.xml
View file

@ -435,6 +435,8 @@
<filter minzoom="16" icon="hostel" tag="tourism" value="motel" />
<filter minzoom="16" icon="museum" tag="tourism" value="museum" />
<filter minzoom="16" icon="view_point" tag="tourism" value="viewpoint" />
<filter minzoom="16" icon="geocache_found" tag="geocache" value="found" />
<filter minzoom="16" icon="geocache_not_found" tag="geocache" />
</point>
<!-- PRIORITY Input to filter : tag, value, zoom [minzoom, maxzoom] -->

BIN
OsmAnd/res/drawable/h_geocache_found.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.5 KiB

BIN
OsmAnd/res/drawable/h_geocache_not_found.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.3 KiB

3
OsmAnd/src/net/osmand/render/RenderingIcons.java
View file

@ -47,6 +47,9 @@ public class RenderingIcons {
icons.put("forest", R.drawable.h_forest); //$NON-NLS-1$
icons.put("fuel", R.drawable.h_fuel); //$NON-NLS-1$
icons.put("gate2", R.drawable.h_gate2); //$NON-NLS-1$
icons.put("geocache_found", R.drawable.h_geocache_found); //$NON-NLS-1$
icons.put("geocache_not_found", R.drawable.h_geocache_not_found); //$NON-NLS-1$
icons.put("guest_house", R.drawable.h_guest_house); //$NON-NLS-1$
icons.put("glacier", R.drawable.h_glacier); //$NON-NLS-1$
icons.put("grave_yard", R.drawable.h_grave_yard); //$NON-NLS-1$
icons.put("guest_house", R.drawable.h_guest_house); //$NON-NLS-1$