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

Merge branch 'master' of github.com:osmandapp/Osmand

Browse source
This commit is contained in:
Alexey Pelykh 2012-05-28 21:56:51 +03:00
commit c119d1628b
6 changed files with 845 additions and 970 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
DataExtractionOSM/src/net/osmand/binary/BinaryMapIndexReader.java
View file

@ -1039,6 +1039,7 @@ public class BinaryMapIndexReader {
dataObject.additionalTypes = new int[0]; dataObject.additionalTypes = new int[0];
} }
dataObject.id = id; dataObject.id = id;
dataObject.area = area;
dataObject.mapIndex = root; dataObject.mapIndex = root;
return dataObject; return dataObject;
} }

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

@ -108,6 +108,7 @@
<filter tag="power" value="minor_line" order="68"/> <filter tag="power" value="minor_line" order="68"/>
<filter layer="1" tag="railway" value="" order="66"/> <filter layer="1" tag="railway" value="" order="66"/>
<filter tag="railway" value="" order="58"/> <filter tag="railway" value="" order="58"/>
<filter tag="public_transport" value="" order="58"/>
<filter layer="1" tag="waterway" value="" order="66"/> <filter layer="1" tag="waterway" value="" order="66"/>
<filter tag="waterway" value="" order="18"/> <filter tag="waterway" value="" order="18"/>
@ -136,9 +137,9 @@
<filter tag="highway" value="road" order="52"/> <filter tag="highway" value="road" order="52"/>
<filter layer="1" tag="highway" value="unclassified" order="66"/> <filter layer="1" tag="highway" value="unclassified" order="66"/>
<filter tag="highway" value="unclassified" order="52"/> <filter tag="highway" value="unclassified" order="52"/>
<filter layer="1" tag="highway" value="residential" order="66"/> <filter layer="1" tag="highway" value="residential" order="66" area="false"/>
<filter tag="highway" value="residential" order="51"/> <filter tag="highway" value="residential" order="51" area="false"/>
<filter layer="1" tag="highway" value="service" order="66"/> <filter layer="1" tag="highway" value="service" order="66" />
<filter tag="highway" value="service" order="51"/> <filter tag="highway" value="service" order="51"/>
<filter layer="1" tag="highway" value="living_street" order="66"/> <filter layer="1" tag="highway" value="living_street" order="66"/>
<filter tag="highway" value="living_street" order="50"/> <filter tag="highway" value="living_street" order="50"/>
@ -783,7 +784,7 @@
<filter tag="highway" value="road"/> <filter tag="highway" value="road"/>
<filter tag="highway" value="unclassified"/> <filter tag="highway" value="unclassified"/>
<filter tag="highway" value="residential"/> <filter tag="highway" value="residential"/>
<groupFilter color="#ffffff" color_2="#464646" minzoom="12" strokeWidth_2="1"> <groupFilter color="#ffffff" color_2="#bababa" minzoom="12" strokeWidth_2="1">
<filter nightMode="true" color="#9f9f9f"/> <filter nightMode="true" color="#9f9f9f"/>
</groupFilter> </groupFilter>
</group> </group>
@ -793,8 +794,8 @@
<filter tag="highway" value="pedestrian"/> <filter tag="highway" value="pedestrian"/>
<filter tag="highway" value="footway"/> <filter tag="highway" value="footway"/>
<groupFilter> <groupFilter>
<filter minzoom="14" color="#ECECEC" color_2="#464646" strokeWidth_2="0.5"/> <filter minzoom="14" color="#ECECEC" color_2="#bababa" strokeWidth_2="0.5"/>
<filter hmRendered="true" minzoom="13" color="#ECECEC" color_2="#464646" strokeWidth_2="0.5"/> <filter hmRendered="true" minzoom="13" color="#ECECEC" color_2="#bababa" strokeWidth_2="0.5"/>
</groupFilter> </groupFilter>
</group> </group>
@ -1351,6 +1352,7 @@
<filter tag="railway" value="funicular" minzoom="15" color="#666666" strokeWidth="2"/> <filter tag="railway" value="funicular" minzoom="15" color="#666666" strokeWidth="2"/>
<filter tag="railway" value="platform" minzoom="15" color="#888888" strokeWidth="3"/> <filter tag="railway" value="platform" minzoom="15" color="#888888" strokeWidth="3"/>
<filter tag="public_transport" value="platform" minzoom="15" color="#888888" strokeWidth="3"/>
<!-- Aeroways --> <!-- Aeroways -->
<filter tag="aeroway" value="runway" color="#bbbbcc"> <filter tag="aeroway" value="runway" color="#bbbbcc">

2
OsmAnd/res/values-ru/strings.xml
View file

@ -73,7 +73,7 @@
<string name="index_name_africa">Африка</string> <string name="index_name_africa">Африка</string>
<string name="index_name_asia">Азия</string> <string name="index_name_asia">Азия</string>
<string name="index_name_oceania">Океания</string> <string name="index_name_oceania">Океания</string>
<string name="index_name_other">Мировые карты</string> <string name="index_name_other">Карты мира</string>
<string name="index_name_wiki">Wikipedia по языкам</string> <string name="index_name_wiki">Wikipedia по языкам</string>
<string name="index_name_voice">Голосовые данные (запись)</string> <string name="index_name_voice">Голосовые данные (запись)</string>
<string name="index_name_tts_voice">Голосовые данные (TTS)</string> <string name="index_name_tts_voice">Голосовые данные (TTS)</string>

6
OsmAnd/res/values-sk/bidforfix.xml Normal file
View file

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="bidforfix_loading">Nahrávam</string>
<string name="bidforfix_supporters">%1$d Podporovateľov</string>
<string name="bidforfix_funded">podpora: %d%%</string>
</resources>

1785
OsmAnd/res/values-sk/strings.xml
View file

File diff suppressed because it is too large Load diff

1
Osmand-kernel/osmand/src/binaryRead.cpp
View file

@ -502,6 +502,7 @@ MapDataObject* readMapDataObject(CodedInputStream* input, MapTreeBounds* tree, S
dataObject->additionalTypes = additionalTypes; dataObject->additionalTypes = additionalTypes;
dataObject->types = types; dataObject->types = types;
dataObject->id = id; dataObject->id = id;
dataObject->area = area;
dataObject->stringIds = stringIds; dataObject->stringIds = stringIds;
dataObject->polygonInnerCoordinates = innercoordinates; dataObject->polygonInnerCoordinates = innercoordinates;