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

Blah blah

Browse source
This commit is contained in:
Denis_Bars 2014-09-29 11:05:37 +03:00
parent 36f46e3176
commit b6d92031e6
38 changed files with 1303 additions and 485 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

181
OsmAnd/assets/OsmAndCore_ResourcesBundle.index
View file

@ -9,6 +9,7 @@
[ddf=1.5]/map/shaders/osmc_red_bg_black_bar.png
[ddf=1.5]/map/shaders/osmc_yellow_bg_black_circle.png
[ddf=1.5]/map/shaders/osmc_yellow_bg_blue_bar.png
[ddf=1.5]/map/shaders/cemetery_small.png
[ddf=1.5]/map/shaders/osmc_white_bg_red_circle.png
[ddf=1.5]/map/shaders/orchard2.png
[ddf=1.5]/map/shaders/osmc_white_green_backslash.png
@ -85,12 +86,10 @@
[ddf=1.5]/map/shaders/osmc_green_bg_black_circle.png
[ddf=1.5]/map/shaders/osmc_red_bg_blue_circle.png
[ddf=1.5]/map/shaders/osmc_white_green_bar.png
[ddf=1.5]/map/shaders/amenity_grave_yard.png
[ddf=1.5]/map/shaders/glacier.png
[ddf=1.5]/map/shaders/paving_stones.png
[ddf=1.5]/map/shaders/osmc_green_bg_blue_circle.png
[ddf=1.5]/map/shaders/osmc_red_bg_blue_bar.png
[ddf=1.5]/map/shaders/pedestrian_paved_night.png
[ddf=1.5]/map/shaders/nr.png
[ddf=1.5]/map/shaders/osmc_black_bg_red_bar.png
[ddf=1.5]/map/shaders/osmc_blue_bg_red_bar.png
@ -125,6 +124,7 @@
[ddf=1.5]/map/shaders/osmc_yellow_bg_green_circle.png
[ddf=1.5]/map/shaders/danger.png
[ddf=1.5]/map/shaders/wood_broadleaved.png
[ddf=1.5]/map/shaders/vineyard2_small.png
[ddf=1.5]/map/shaders/osmc_yellow_bg_blue_circle.png
[ddf=1.5]/map/shaders/osmc_white_bg_blue_circle.png
[ddf=1.5]/map/shaders/osmc_green_bg_red_circle.png
@ -137,7 +137,6 @@
[ddf=1.5]/map/shaders/osmc_white_bg_black_bar.png
[ddf=1.5]/map/shaders/scrub.png
[ddf=1.5]/map/shaders/bare_rock.png
[ddf=1.5]/map/shaders/pedestrian_paved.png
[ddf=1.5]/map/shaders/osmc_white_bg_red_bar.png
[ddf=1.5]/map/shaders/osmc_red_bg_black_circle.png
[ddf=1.5]/map/icons/railway_subway_station_small_blue.png
@ -158,6 +157,7 @@
[ddf=1.5]/map/icons/sport_skating.png
[ddf=1.5]/map/icons/historic_memorial.png
[ddf=1.5]/map/icons/natural_peak_framed_big.png
[ddf=1.5]/map/icons/tower_type_communication2.png
[ddf=1.5]/map/icons/man_made_chimney.png
[ddf=1.5]/map/icons/shop_computer.png
[ddf=1.5]/map/icons/restaurants.png
@ -371,6 +371,7 @@
[ddf=1.5]/map/icons/railway_subway_entrance_black.png
[ddf=1.5]/map/icons/shop_copyshop.png
[ddf=1.5]/map/icons/emergency_fire_hydrant.png
[ddf=1.5]/map/icons/highway_services.png
[ddf=1.5]/map/icons/historic_wayside_cross.png
[ddf=1.5]/map/icons/tourism_information.png
[ddf=1.5]/map/icons/railway_subway_station_small_purple.png
@ -577,6 +578,7 @@
[ddf=2.0]/map/shaders/osmc_red_bg_black_bar.png
[ddf=2.0]/map/shaders/osmc_yellow_bg_black_circle.png
[ddf=2.0]/map/shaders/osmc_yellow_bg_blue_bar.png
[ddf=2.0]/map/shaders/cemetery_small.png
[ddf=2.0]/map/shaders/osmc_white_bg_red_circle.png
[ddf=2.0]/map/shaders/orchard2.png
[ddf=2.0]/map/shaders/osmc_white_green_backslash.png
@ -653,12 +655,10 @@
[ddf=2.0]/map/shaders/osmc_green_bg_black_circle.png
[ddf=2.0]/map/shaders/osmc_red_bg_blue_circle.png
[ddf=2.0]/map/shaders/osmc_white_green_bar.png
[ddf=2.0]/map/shaders/amenity_grave_yard.png
[ddf=2.0]/map/shaders/glacier.png
[ddf=2.0]/map/shaders/paving_stones.png
[ddf=2.0]/map/shaders/osmc_green_bg_blue_circle.png
[ddf=2.0]/map/shaders/osmc_red_bg_blue_bar.png
[ddf=2.0]/map/shaders/pedestrian_paved_night.png
[ddf=2.0]/map/shaders/nr.png
[ddf=2.0]/map/shaders/osmc_black_bg_red_bar.png
[ddf=2.0]/map/shaders/osmc_blue_bg_red_bar.png
@ -693,6 +693,7 @@
[ddf=2.0]/map/shaders/osmc_yellow_bg_green_circle.png
[ddf=2.0]/map/shaders/danger.png
[ddf=2.0]/map/shaders/wood_broadleaved.png
[ddf=2.0]/map/shaders/vineyard2_small.png
[ddf=2.0]/map/shaders/osmc_yellow_bg_blue_circle.png
[ddf=2.0]/map/shaders/osmc_white_bg_blue_circle.png
[ddf=2.0]/map/shaders/osmc_green_bg_red_circle.png
@ -705,7 +706,6 @@
[ddf=2.0]/map/shaders/osmc_white_bg_black_bar.png
[ddf=2.0]/map/shaders/scrub.png
[ddf=2.0]/map/shaders/bare_rock.png
[ddf=2.0]/map/shaders/pedestrian_paved.png
[ddf=2.0]/map/shaders/osmc_white_bg_red_bar.png
[ddf=2.0]/map/shaders/osmc_red_bg_black_circle.png
[ddf=2.0]/map/icons/railway_subway_station_small_blue.png
@ -726,6 +726,7 @@
[ddf=2.0]/map/icons/sport_skating.png
[ddf=2.0]/map/icons/historic_memorial.png
[ddf=2.0]/map/icons/natural_peak_framed_big.png
[ddf=2.0]/map/icons/tower_type_communication2.png
[ddf=2.0]/map/icons/man_made_chimney.png
[ddf=2.0]/map/icons/shop_computer.png
[ddf=2.0]/map/icons/restaurants.png
@ -939,6 +940,7 @@
[ddf=2.0]/map/icons/railway_subway_entrance_black.png
[ddf=2.0]/map/icons/shop_copyshop.png
[ddf=2.0]/map/icons/emergency_fire_hydrant.png
[ddf=2.0]/map/icons/highway_services.png
[ddf=2.0]/map/icons/historic_wayside_cross.png
[ddf=2.0]/map/icons/tourism_information.png
[ddf=2.0]/map/icons/railway_subway_station_small_purple.png
@ -1145,6 +1147,7 @@
[ddf=1.0]/map/shaders/osmc_red_bg_black_bar.png
[ddf=1.0]/map/shaders/osmc_yellow_bg_black_circle.png
[ddf=1.0]/map/shaders/osmc_yellow_bg_blue_bar.png
[ddf=1.0]/map/shaders/cemetery_small.png
[ddf=1.0]/map/shaders/osmc_white_bg_red_circle.png
[ddf=1.0]/map/shaders/orchard2.png
[ddf=1.0]/map/shaders/osmc_white_green_backslash.png
@ -1221,12 +1224,10 @@
[ddf=1.0]/map/shaders/osmc_green_bg_black_circle.png
[ddf=1.0]/map/shaders/osmc_red_bg_blue_circle.png
[ddf=1.0]/map/shaders/osmc_white_green_bar.png
[ddf=1.0]/map/shaders/amenity_grave_yard.png
[ddf=1.0]/map/shaders/glacier.png
[ddf=1.0]/map/shaders/paving_stones.png
[ddf=1.0]/map/shaders/osmc_green_bg_blue_circle.png
[ddf=1.0]/map/shaders/osmc_red_bg_blue_bar.png
[ddf=1.0]/map/shaders/pedestrian_paved_night.png
[ddf=1.0]/map/shaders/nr.png
[ddf=1.0]/map/shaders/osmc_black_bg_red_bar.png
[ddf=1.0]/map/shaders/osmc_blue_bg_red_bar.png
@ -1261,6 +1262,7 @@
[ddf=1.0]/map/shaders/osmc_yellow_bg_green_circle.png
[ddf=1.0]/map/shaders/danger.png
[ddf=1.0]/map/shaders/wood_broadleaved.png
[ddf=1.0]/map/shaders/vineyard2_small.png
[ddf=1.0]/map/shaders/osmc_yellow_bg_blue_circle.png
[ddf=1.0]/map/shaders/osmc_white_bg_blue_circle.png
[ddf=1.0]/map/shaders/osmc_green_bg_red_circle.png
@ -1273,7 +1275,6 @@
[ddf=1.0]/map/shaders/osmc_white_bg_black_bar.png
[ddf=1.0]/map/shaders/scrub.png
[ddf=1.0]/map/shaders/bare_rock.png
[ddf=1.0]/map/shaders/pedestrian_paved.png
[ddf=1.0]/map/shaders/osmc_white_bg_red_bar.png
[ddf=1.0]/map/shaders/osmc_red_bg_black_circle.png
[ddf=1.0]/map/icons/railway_subway_station_small_blue.png
@ -1294,6 +1295,7 @@
[ddf=1.0]/map/icons/sport_skating.png
[ddf=1.0]/map/icons/historic_memorial.png
[ddf=1.0]/map/icons/natural_peak_framed_big.png
[ddf=1.0]/map/icons/tower_type_communication2.png
[ddf=1.0]/map/icons/man_made_chimney.png
[ddf=1.0]/map/icons/shop_computer.png
[ddf=1.0]/map/icons/restaurants.png
@ -1507,6 +1509,7 @@
[ddf=1.0]/map/icons/railway_subway_entrance_black.png
[ddf=1.0]/map/icons/shop_copyshop.png
[ddf=1.0]/map/icons/emergency_fire_hydrant.png
[ddf=1.0]/map/icons/highway_services.png
[ddf=1.0]/map/icons/historic_wayside_cross.png
[ddf=1.0]/map/icons/tourism_information.png
[ddf=1.0]/map/icons/railway_subway_station_small_purple.png
@ -1702,51 +1705,125 @@
[ddf=1.0]/map/shields/white_gray_round_shield.png
[ddf=1.0]/map/shields/white_brown_square_shield.png
[ddf=1.0]/map/shields/gray_green_round_shield.png
misc/icu4c/icu-data-l.dat
routing/routing.xml
map/fonts/DroidSansFallback.ttf
map/fonts/MTLmr3m.ttf
map/fonts/NotoNaskh/NotoNaskhArabic-Regular.ttf
map/fonts/NotoNaskh/NotoNaskhArabic-Bold.ttf
map/fonts/Tinos/Tinos-Bold.ttf
map/fonts/Tinos/Tinos-BoldItalic.ttf
map/fonts/Tinos/Tinos-Regular.ttf
map/fonts/Tinos/Tinos-Italic.ttf
map/fonts/OpenSans/OpenSans-SemiboldItalic.ttf
map/fonts/OpenSans/OpenSans-Regular.ttf
map/fonts/OpenSans/OpenSans-Italic.ttf
map/fonts/OpenSans/OpenSans-Semibold.ttf
map/fonts/NotoKufi/NotoKufiArabic-Regular.ttf
map/fonts/NotoKufi/NotoKufiArabic-Bold.ttf
map/fonts/NotoSans-extra/NotoSansMongolian-Regular.ttf
map/fonts/NotoSans-extra/NotoSansBrahmi-Regular.ttf
map/fonts/NotoSans-extra/NotoSansLydian-Regular.ttf
map/fonts/NotoSans-extra/NotoSansOgham-Regular.ttf
map/fonts/NotoSans-extra/NotoSansCanadianAboriginal-Regular.ttf
map/fonts/NotoSans-extra/NotoSansPhoenician-Regular.ttf
map/fonts/NotoSans-extra/NotoSansJavanese-Regular.ttf
map/fonts/NotoSans-extra/NotoSansKaithi-Regular.ttf
map/fonts/NotoSans-extra/NotoSansTaiLe-Regular.ttf
map/fonts/NotoSans-extra/NotoSansLycian-Regular.ttf
map/fonts/NotoSans-extra/NotoSansSundanese-Regular.ttf
map/fonts/NotoSans-extra/NotoSansRunic-Regular.ttf
map/fonts/NotoSans-extra/NotoSansInscriptionalPahlavi-Regular.ttf
map/fonts/NotoSans-extra/NotoSansSyriacEastern-Regular.ttf
map/fonts/NotoSans-extra/NotoSansGlagolitic-Regular.ttf
map/fonts/NotoSans-extra/NotoSansInscriptionalParthian-Regular.ttf
map/fonts/NotoSans-extra/NotoSansTaiTham-Regular.ttf
map/fonts/NotoSans-extra/NotoSansAvestan-Regular.ttf
map/fonts/NotoSans-extra/NotoSansSyriacEstrangela-Regular.ttf
map/fonts/NotoSans-extra/NotoSansBuhid-Regular.ttf
map/fonts/NotoSans-extra/NotoSansCarian-Regular.ttf
map/fonts/NotoSans-extra/NotoSansSamaritan-Regular.ttf
map/fonts/NotoSans-extra/NotoSansBatak-Regular.ttf
map/fonts/NotoSans-extra/NotoSansLisu-Regular.ttf
map/fonts/NotoSans-extra/NotoSansTifinagh-Regular.ttf
map/fonts/NotoSans-extra/NotoSansCypriot-Regular.ttf
map/fonts/NotoSans-extra/NotoSansDeseret-Regular.ttf
map/fonts/NotoSans-extra/NotoSansSaurashtra-Regular.ttf
map/fonts/NotoSans-extra/NotoSansLinearB-Regular.ttf
map/fonts/NotoSans-extra/NotoSansBuginese-Regular.ttf
map/fonts/NotoSans-extra/NotoSansRejang-Regular.ttf
map/fonts/NotoSans-extra/NotoSansGothic-Regular.ttf
map/fonts/NotoSans-extra/NotoSansBalinese-Regular.ttf
map/fonts/NotoSans-extra/NotoSansImperialAramaic-Regular.ttf
map/fonts/NotoSans-extra/NotoSansSinhala-Regular.ttf
map/fonts/NotoSans-extra/NotoSansTagalog-Regular.ttf
map/fonts/NotoSans-extra/NotoSansKharoshthi-Regular.ttf
map/fonts/NotoSans-extra/NotoSansVai-Regular.ttf
map/fonts/NotoSans-extra/NotoSansOldSouthArabian-Regular.ttf
map/fonts/NotoSans-extra/NotoSansMeeteiMayek-Regular.ttf
map/fonts/NotoSans-extra/NotoSansLimbu-Regular.ttf
map/fonts/NotoSans-extra/NotoSansOlChiki-Regular.ttf
map/fonts/NotoSans-extra/NotoSansPhagsPa-Regular.ttf
map/fonts/NotoSans-extra/NotoSansKayahLi-Regular.ttf
map/fonts/NotoSans-extra/NotoSansOldItalic-Regular.ttf
map/fonts/NotoSans-extra/NotoSansMandaic-Regular.ttf
map/fonts/NotoSans-extra/NotoSansHanunoo-Regular.ttf
map/fonts/NotoSans-extra/NotoSansSylotiNagri-Regular.ttf
map/fonts/NotoSans-extra/NotoSansSinhala-Bold.ttf
map/fonts/NotoSans-extra/NotoSansCuneiform-Regular.ttf
map/fonts/NotoSans-extra/NotoSansCoptic-Regular.ttf
map/fonts/NotoSans-extra/NotoSansSymbols-Regular.ttf
map/fonts/NotoSans-extra/NotoSansYi-Regular.ttf
map/fonts/NotoSans-extra/NotoSansShavian-Regular.ttf
map/fonts/NotoSans-extra/NotoSansMyanmar-Bold.ttf
map/fonts/NotoSans-extra/NotoSansTaiViet-Regular.ttf
map/fonts/NotoSans-extra/NotoSansTagbanwa-Regular.ttf
map/fonts/NotoSans-extra/NotoSansBamum-Regular.ttf
map/fonts/NotoSans-extra/NotoSansOldPersian-Regular.ttf
map/fonts/NotoSans-extra/NotoSansMyanmar-Regular.ttf
map/fonts/NotoSans-extra/NotoSansOsmanya-Regular.ttf
map/fonts/NotoSans-extra/NotoSansEgyptianHieroglyphs-Regular.ttf
map/fonts/NotoSans-extra/NotoSansOldTurkic-Regular.ttf
map/fonts/NotoSans-extra/NotoSansCherokee-Regular.ttf
map/fonts/NotoSans-extra/NotoSansUgaritic-Regular.ttf
map/fonts/NotoSans-extra/NotoSansNKo-Regular.ttf
map/fonts/NotoSans-extra/NotoSansLepcha-Regular.ttf
map/fonts/NotoSans-extra/NotoSansNewTaiLue-Regular.ttf
map/fonts/NotoSans-extra/NotoSansSyriacWestern-Regular.ttf
map/fonts/NotoSans/NotoSansMalayalam-Regular.ttf
map/fonts/NotoSans/NotoSansCham-Bold.ttf
map/fonts/NotoSans/NotoSansKannada-Regular.ttf
map/fonts/NotoSans/NotoSansThai-Regular.ttf
map/fonts/NotoSans/NotoSansGeorgian-Bold.ttf
map/fonts/NotoSans/NotoSansGurmukhi-Regular.ttf
map/fonts/NotoSans/NotoSansHebrew-Regular.ttf
map/fonts/NotoSans/NotoSansEthiopic-Regular.ttf
map/fonts/NotoSans/NotoSansHebrew-Bold.ttf
map/fonts/NotoSans/NotoSansGujarati-Regular.ttf
map/fonts/NotoSans/NotoSansKhmer-Regular.ttf
map/fonts/NotoSans/NotoSansGurmukhi-Bold.ttf
map/fonts/NotoSans/NotoSansTelugu-Regular.ttf
map/fonts/NotoSans/NotoSansDevanagari-Regular.ttf
map/fonts/NotoSans/NotoSansGujarati-Bold.ttf
map/fonts/NotoSans/NotoSansLao-Regular.ttf
map/fonts/NotoSans/NotoSansLao-Bold.ttf
map/fonts/NotoSans/NotoSansTelugu-Bold.ttf
map/fonts/NotoSans/NotoSansBengali-Bold.ttf
map/fonts/NotoSans/NotoSansArmenian-Regular.ttf
map/fonts/NotoSans/NotoSansTamil-Regular.ttf
map/fonts/NotoSans/NotoSansDevanagari-Bold.ttf
map/fonts/NotoSans/NotoSansEthiopic-Bold.ttf
map/fonts/NotoSans/NotoSansThai-Bold.ttf
map/fonts/NotoSans/NotoSansGeorgian-Regular.ttf
map/fonts/NotoSans/NotoSansArmenian-Bold.ttf
map/fonts/NotoSans/NotoSansBengali-Regular.ttf
map/fonts/NotoSans/NotoSansKhmer-Bold.ttf
map/fonts/NotoSans/NotoSansMalayalam-Bold.ttf
map/fonts/NotoSans/NotoSansKannada-Bold.ttf
map/fonts/NotoSans/NotoSansTamil-Bold.ttf
map/fonts/NotoSans/NotoSansCham-Regular.ttf
map/styles/default.map_styles_presets.xml
map/styles/default.render.xml
map/stubs/favorite_location_pin_icon.png
map/stubs/processing_tile.png
map/stubs/unavailable_tile.png
misc/icu4c/icu-data-l.dat
map/fonts/DroidSansHebrew-Regular.ttf
map/fonts/NotoSansKannada-Regular.ttf
map/fonts/NotoSansMalayalam.ttf
map/fonts/NotoSansThai-Regular.ttf
map/fonts/NotoSansGeorgian-Bold.ttf
map/fonts/DroidNaskh-Bold.ttf
map/fonts/DroidSansEthiopic-Regular.ttf
map/fonts/NotoSansHebrew-Regular.ttf
map/fonts/DroidSansHebrew-Bold.ttf
map/fonts/NotoSansHebrew-Bold.ttf
map/fonts/NotoSansKhmer-Regular.ttf
map/fonts/DroidSansFallback.ttf
map/fonts/DroidSansGeorgian.ttf
map/fonts/DroidNaskh-Regular.ttf
map/fonts/MTLmr3m.ttf
map/fonts/NotoSansTelugu-Regular.ttf
map/fonts/NotoSansDevanagari-Regular.ttf
map/fonts/NotoSansLao-Regular.ttf
map/fonts/NotoSansLao-Bold.ttf
map/fonts/NotoSansTelugu-Bold.ttf
map/fonts/NotoSansBengali-Bold.ttf
map/fonts/NotoSansArmenian-Regular.ttf
map/fonts/NotoSansTamil-Regular.ttf
map/fonts/NotoSansDevanagari-Bold.ttf
map/fonts/DroidSansEthiopic-Bold.ttf
map/fonts/NotoSansThai-Bold.ttf
map/fonts/NotoSansGeorgian-Regular.ttf
map/fonts/NotoSansArmenian-Bold.ttf
map/fonts/NotoSansBengali-Regular.ttf
map/fonts/NotoSansKhmer-Bold.ttf
map/fonts/NotoSansMalayalam-Bold.ttf
map/fonts/NotoSansKannada-Bold.ttf
map/fonts/DroidSansJapanese.ttf
map/fonts/NotoSansTamil-Bold.ttf
map/fonts/DroidSansArmenian.ttf
map/fonts/DroidSansArabic.ttf
map/fonts/OpenSans/OpenSans-SemiboldItalic.ttf
map/fonts/OpenSans/OpenSans-Regular.ttf
map/fonts/OpenSans/OpenSans-Italic.ttf
map/fonts/OpenSans/OpenSans-Semibold.ttf
map/stubs/unavailable_tile.png

19
OsmAnd/src/net/osmand/core/android/CoreResourcesFromAndroidAssets.java
View file

@ -162,12 +162,9 @@ public class CoreResourcesFromAndroidAssets extends ICoreResourcesProvider {
resourceDataEntry = resourceEntry.variantsByDisplayDensityFactor.lastEntry();
ResourceData resourceData = resourceDataEntry.getValue();
Log.d(TAG, "Using ddf=" + resourceDataEntry.getKey() + " while looking for " + displayDensityFactor + " of '" + name + "'");
final SWIGTYPE_p_QByteArray data = SwigUtilities.readPartOfFile(
// _bundleFilename,
resourceData.path.getAbsolutePath(),
resourceData.offset,
resourceData.size);
System.out.println(resourceData.path.getAbsolutePath());
final SWIGTYPE_p_QByteArray data = SwigUtilities.qDecompress(SwigUtilities.readEntireFile(
resourceData.path.getAbsolutePath()+".qz"));
if (data == null) {
Log.e(TAG, "Failed to load data of '" + name + "'");
if (ok != null)
@ -198,12 +195,10 @@ public class CoreResourcesFromAndroidAssets extends ICoreResourcesProvider {
ok.assign(false);
return SwigUtilities.emptyQByteArray();
}
final SWIGTYPE_p_QByteArray data = SwigUtilities.readPartOfFile(
// _bundleFilename,
resourceEntry.defaultVariant.path.getAbsolutePath(),
resourceEntry.defaultVariant.offset,
resourceEntry.defaultVariant.size);
System.out.println(resourceEntry.defaultVariant.path.getAbsolutePath());
SWIGTYPE_p_QByteArray bt = SwigUtilities.readEntireFile(
resourceEntry.defaultVariant.path.getAbsolutePath() + ".qz");
final SWIGTYPE_p_QByteArray data = SwigUtilities.qDecompress(bt);
if (data == null) {
Log.e(TAG, "Failed to load data of '" + name + "'");
if (ok != null)

6
OsmAnd/src/net/osmand/core/android/GLActivity.java
View file

@ -21,7 +21,7 @@ import net.osmand.core.jni.Logger;
import net.osmand.core.jni.MapPresentationEnvironment;
import net.osmand.core.jni.MapRendererClass;
import net.osmand.core.jni.MapRendererSetupOptions;
import net.osmand.core.jni.MapStyle;
import net.osmand.core.jni.ResolvedMapStyle;
import net.osmand.core.jni.MapStylesCollection;
import net.osmand.core.jni.ObfsCollection;
import net.osmand.core.jni.OsmAndCore;
@ -70,7 +70,7 @@ public class GLActivity extends Activity {
private int _referenceTileSize;
private int _rasterTileSize;
private IMapStylesCollection _mapStylesCollection;
private MapStyle _mapStyle;
private ResolvedMapStyle _mapStyle;
private ObfsCollection _obfsCollection;
private MapPresentationEnvironment _mapPresentationEnvironment;
private Primitiviser _primitiviser;
@ -192,7 +192,7 @@ public class GLActivity extends Activity {
Log.i(TAG, "Going to resolve default embedded style...");
_mapStylesCollection = new MapStylesCollection();
_mapStyle = _mapStylesCollection.getBakedStyle("default");
_mapStyle = _mapStylesCollection.getResolvedStyleByName("default");
if (_mapStyle == null)
{
Log.e(TAG, "Failed to resolve style 'default'");

8
OsmAnd/src/net/osmand/core/jni/ColorARGB.java
View file

@ -39,12 +39,16 @@ public class ColorARGB {
this(OsmAndCoreJNI.new_ColorARGB__SWIG_0(), true);
}
public ColorARGB(long argb_) {
this(OsmAndCoreJNI.new_ColorARGB__SWIG_1(argb_), true);
}
public ColorARGB(short a_, short r_, short g_, short b_) {
this(OsmAndCoreJNI.new_ColorARGB__SWIG_1(a_, r_, g_, b_), true);
this(OsmAndCoreJNI.new_ColorARGB__SWIG_2(a_, r_, g_, b_), true);
}
public ColorARGB(FColorARGB other) {
this(OsmAndCoreJNI.new_ColorARGB__SWIG_2(FColorARGB.getCPtr(other), other), true);
this(OsmAndCoreJNI.new_ColorARGB__SWIG_3(FColorARGB.getCPtr(other), other), true);
}
public void setA(short value) {

4
OsmAnd/src/net/osmand/core/jni/IMapRenderer.java
View file

@ -84,6 +84,10 @@ public class IMapRenderer {
return OsmAndCoreJNI.IMapRenderer_isIdle(swigCPtr, this);
}
public String getNotIdleReason() {
return OsmAndCoreJNI.IMapRenderer_getNotIdleReason(swigCPtr, this);
}
public boolean pauseGpuWorkerThread() {
return OsmAndCoreJNI.IMapRenderer_pauseGpuWorkerThread(swigCPtr, this);
}

19
OsmAnd/src/net/osmand/core/jni/IMapStylesCollection.java
View file

@ -35,22 +35,17 @@ public class IMapStylesCollection {
}
}
public SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__MapStyle_const_t_t getCollection() {
return new SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__MapStyle_const_t_t(OsmAndCoreJNI.IMapStylesCollection_getCollection(swigCPtr, this), true);
public SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__UnresolvedMapStyle_const_t_t getCollection() {
return new SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__UnresolvedMapStyle_const_t_t(OsmAndCoreJNI.IMapStylesCollection_getCollection(swigCPtr, this), true);
}
public MapStyle getAsIsStyle(String name) {
long cPtr = OsmAndCoreJNI.IMapStylesCollection_getAsIsStyle(swigCPtr, this, name);
return (cPtr == 0) ? null : new MapStyle(cPtr, true);
public SWIGTYPE_p_std__shared_ptrT_OsmAnd__UnresolvedMapStyle_const_t getStyleByName(String name) {
return new SWIGTYPE_p_std__shared_ptrT_OsmAnd__UnresolvedMapStyle_const_t(OsmAndCoreJNI.IMapStylesCollection_getStyleByName(swigCPtr, this, name), true);
}
public boolean obtainBakedStyle(String name, MapStyle outStyle) {
return OsmAndCoreJNI.IMapStylesCollection_obtainBakedStyle(swigCPtr, this, name, MapStyle.getCPtr(outStyle), outStyle);
}
public MapStyle getBakedStyle(String name) {
long cPtr = OsmAndCoreJNI.IMapStylesCollection_getBakedStyle(swigCPtr, this, name);
return (cPtr == 0) ? null : new MapStyle(cPtr, true);
public ResolvedMapStyle getResolvedStyleByName(String name) {
long cPtr = OsmAndCoreJNI.IMapStylesCollection_getResolvedStyleByName(swigCPtr, this, name);
return (cPtr == 0) ? null : new ResolvedMapStyle(cPtr, true);
}
}

84
OsmAnd/src/net/osmand/core/jni/MapPresentationEnvironment.java
View file

@ -35,20 +35,24 @@ public class MapPresentationEnvironment {
}
}
public MapPresentationEnvironment(MapStyle style, float displayDensityFactor, String localeLanguageId, ICoreResourcesProvider externalResourcesProvider) {
this(OsmAndCoreJNI.new_MapPresentationEnvironment__SWIG_0(MapStyle.getCPtr(style), style, displayDensityFactor, localeLanguageId, ICoreResourcesProvider.getCPtr(externalResourcesProvider), externalResourcesProvider), true);
public MapPresentationEnvironment(ResolvedMapStyle resolvedStyle, float displayDensityFactor, String localeLanguageId, MapPresentationEnvironment.LanguagePreference languagePreference, ICoreResourcesProvider externalResourcesProvider) {
this(OsmAndCoreJNI.new_MapPresentationEnvironment__SWIG_0(ResolvedMapStyle.getCPtr(resolvedStyle), resolvedStyle, displayDensityFactor, localeLanguageId, languagePreference.swigValue(), ICoreResourcesProvider.getCPtr(externalResourcesProvider), externalResourcesProvider), true);
}
public MapPresentationEnvironment(MapStyle style, float displayDensityFactor, String localeLanguageId) {
this(OsmAndCoreJNI.new_MapPresentationEnvironment__SWIG_1(MapStyle.getCPtr(style), style, displayDensityFactor, localeLanguageId), true);
public MapPresentationEnvironment(ResolvedMapStyle resolvedStyle, float displayDensityFactor, String localeLanguageId, MapPresentationEnvironment.LanguagePreference languagePreference) {
this(OsmAndCoreJNI.new_MapPresentationEnvironment__SWIG_1(ResolvedMapStyle.getCPtr(resolvedStyle), resolvedStyle, displayDensityFactor, localeLanguageId, languagePreference.swigValue()), true);
}
public MapPresentationEnvironment(MapStyle style, float displayDensityFactor) {
this(OsmAndCoreJNI.new_MapPresentationEnvironment__SWIG_2(MapStyle.getCPtr(style), style, displayDensityFactor), true);
public MapPresentationEnvironment(ResolvedMapStyle resolvedStyle, float displayDensityFactor, String localeLanguageId) {
this(OsmAndCoreJNI.new_MapPresentationEnvironment__SWIG_2(ResolvedMapStyle.getCPtr(resolvedStyle), resolvedStyle, displayDensityFactor, localeLanguageId), true);
}
public MapPresentationEnvironment(MapStyle style) {
this(OsmAndCoreJNI.new_MapPresentationEnvironment__SWIG_3(MapStyle.getCPtr(style), style), true);
public MapPresentationEnvironment(ResolvedMapStyle resolvedStyle, float displayDensityFactor) {
this(OsmAndCoreJNI.new_MapPresentationEnvironment__SWIG_3(ResolvedMapStyle.getCPtr(resolvedStyle), resolvedStyle, displayDensityFactor), true);
}
public MapPresentationEnvironment(ResolvedMapStyle resolvedStyle) {
this(OsmAndCoreJNI.new_MapPresentationEnvironment__SWIG_4(ResolvedMapStyle.getCPtr(resolvedStyle), resolvedStyle), true);
}
public MapStyleBuiltinValueDefinitions getStyleBuiltinValueDefs() {
@ -56,9 +60,9 @@ public class MapPresentationEnvironment {
return (cPtr == 0) ? null : new MapStyleBuiltinValueDefinitions(cPtr, true);
}
public MapStyle getStyle() {
long cPtr = OsmAndCoreJNI.MapPresentationEnvironment_style_get(swigCPtr, this);
return (cPtr == 0) ? null : new MapStyle(cPtr, true);
public ResolvedMapStyle getResolvedStyle() {
long cPtr = OsmAndCoreJNI.MapPresentationEnvironment_resolvedStyle_get(swigCPtr, this);
return (cPtr == 0) ? null : new ResolvedMapStyle(cPtr, true);
}
public float getDisplayDensityFactor() {
@ -69,6 +73,10 @@ public class MapPresentationEnvironment {
return OsmAndCoreJNI.MapPresentationEnvironment_localeLanguageId_get(swigCPtr, this);
}
public MapPresentationEnvironment.LanguagePreference getLanguagePreference() {
return MapPresentationEnvironment.LanguagePreference.swigToEnum(OsmAndCoreJNI.MapPresentationEnvironment_languagePreference_get(swigCPtr, this));
}
public ICoreResourcesProvider getExternalResourcesProvider() {
long cPtr = OsmAndCoreJNI.MapPresentationEnvironment_externalResourcesProvider_get(swigCPtr, this);
return (cPtr == 0) ? null : new ICoreResourcesProvider(cPtr, true);
@ -78,12 +86,12 @@ public class MapPresentationEnvironment {
return new SWIGTYPE_p_std__shared_ptrT_OsmAnd__ObfMapSectionInfo_const_t(OsmAndCoreJNI.MapPresentationEnvironment_dummyMapSection_get(swigCPtr, this), false);
}
public SWIGTYPE_p_QHashT_std__shared_ptrT_OsmAnd__MapStyleValueDefinition_const_t_OsmAnd__MapStyleValue_t getSettings() {
return new SWIGTYPE_p_QHashT_std__shared_ptrT_OsmAnd__MapStyleValueDefinition_const_t_OsmAnd__MapStyleValue_t(OsmAndCoreJNI.MapPresentationEnvironment_getSettings(swigCPtr, this), true);
public SWIGTYPE_p_QHashT_int_OsmAnd__MapStyleConstantValue_t getSettings() {
return new SWIGTYPE_p_QHashT_int_OsmAnd__MapStyleConstantValue_t(OsmAndCoreJNI.MapPresentationEnvironment_getSettings(swigCPtr, this), true);
}
public void setSettings(SWIGTYPE_p_QHashT_std__shared_ptrT_OsmAnd__MapStyleValueDefinition_const_t_OsmAnd__MapStyleValue_t newSettings) {
OsmAndCoreJNI.MapPresentationEnvironment_setSettings__SWIG_0(swigCPtr, this, SWIGTYPE_p_QHashT_std__shared_ptrT_OsmAnd__MapStyleValueDefinition_const_t_OsmAnd__MapStyleValue_t.getCPtr(newSettings));
public void setSettings(SWIGTYPE_p_QHashT_int_OsmAnd__MapStyleConstantValue_t newSettings) {
OsmAndCoreJNI.MapPresentationEnvironment_setSettings__SWIG_0(swigCPtr, this, SWIGTYPE_p_QHashT_int_OsmAnd__MapStyleConstantValue_t.getCPtr(newSettings));
}
public void setSettings(SWIGTYPE_p_QHashT_QString_QString_t newSettings) {
@ -130,6 +138,52 @@ public class MapPresentationEnvironment {
return OsmAndCoreJNI.MapPresentationEnvironment_getRoadsDensityLimitPerTile(swigCPtr, this, zoom.swigValue());
}
public enum LanguagePreference {
NativeOnly,
LocalizedOrNative,
NativeAndLocalized,
NativeAndLocalizedOrTransliterated,
LocalizedAndNative,
LocalizedOrTransliteratedAndNative;
public final int swigValue() {
return swigValue;
}
public static LanguagePreference swigToEnum(int swigValue) {
LanguagePreference[] swigValues = LanguagePreference.class.getEnumConstants();
if (swigValue < swigValues.length && swigValue >= 0 && swigValues[swigValue].swigValue == swigValue)
return swigValues[swigValue];
for (LanguagePreference swigEnum : swigValues)
if (swigEnum.swigValue == swigValue)
return swigEnum;
throw new IllegalArgumentException("No enum " + LanguagePreference.class + " with value " + swigValue);
}
@SuppressWarnings("unused")
private LanguagePreference() {
this.swigValue = SwigNext.next++;
}
@SuppressWarnings("unused")
private LanguagePreference(int swigValue) {
this.swigValue = swigValue;
SwigNext.next = swigValue+1;
}
@SuppressWarnings("unused")
private LanguagePreference(LanguagePreference swigEnum) {
this.swigValue = swigEnum.swigValue;
SwigNext.next = this.swigValue+1;
}
private final int swigValue;
private static class SwigNext {
private static int next = 0;
}
}
public final static int DefaultShadowLevelMin = OsmAndCoreJNI.MapPresentationEnvironment_DefaultShadowLevelMin_get();
public final static int DefaultShadowLevelMax = OsmAndCoreJNI.MapPresentationEnvironment_DefaultShadowLevelMax_get();

4
OsmAnd/src/net/osmand/core/jni/MapRendererStateChanges.java
View file

@ -59,4 +59,8 @@ public class MapRendererStateChanges {
return new SWIGTYPE_p_OsmAnd__BitmaskT_OsmAnd__MapRendererStateChange_unsigned_int_t__BitmaskT(OsmAndCoreJNI.MapRendererStateChanges_unset(swigCPtr, this, flag.swigValue()), false);
}
public SWIGTYPE_p_OsmAnd__BitmaskT_OsmAnd__MapRendererStateChange_unsigned_int_t__BitmaskT unite(SWIGTYPE_p_OsmAnd__BitmaskT_OsmAnd__MapRendererStateChange_unsigned_int_t__BitmaskT otherMask) {
return new SWIGTYPE_p_OsmAnd__BitmaskT_OsmAnd__MapRendererStateChange_unsigned_int_t__BitmaskT(OsmAndCoreJNI.MapRendererStateChanges_unite(swigCPtr, this, SWIGTYPE_p_OsmAnd__BitmaskT_OsmAnd__MapRendererStateChange_unsigned_int_t__BitmaskT.getCPtr(otherMask)), false);
}
}

116
OsmAnd/src/net/osmand/core/jni/MapStyle.java
View file

@ -1,116 +0,0 @@
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
* Version 3.0.3
*
* Do not make changes to this file unless you know what you are doing--modify
* the SWIG interface file instead.
* ----------------------------------------------------------------------------- */
package net.osmand.core.jni;
public class MapStyle {
private long swigCPtr;
private boolean swigCMemOwn;
protected MapStyle(long cPtr, boolean cMemoryOwn) {
swigCMemOwn = cMemoryOwn;
swigCPtr = cPtr;
}
protected static long getCPtr(MapStyle obj) {
return (obj == null) ? 0 : obj.swigCPtr;
}
protected void finalize() {
delete();
}
public synchronized void delete() {
if (swigCPtr != 0) {
if (swigCMemOwn) {
swigCMemOwn = false;
OsmAndCoreJNI.delete_MapStyle(swigCPtr);
}
swigCPtr = 0;
}
}
public MapStyle(IMapStylesCollection collection, String name, SWIGTYPE_p_std__shared_ptrT_QIODevice_t source) {
this(OsmAndCoreJNI.new_MapStyle__SWIG_0(IMapStylesCollection.getCPtr(collection), collection, name, SWIGTYPE_p_std__shared_ptrT_QIODevice_t.getCPtr(source)), true);
}
public MapStyle(IMapStylesCollection collection, String name, String fileName) {
this(OsmAndCoreJNI.new_MapStyle__SWIG_1(IMapStylesCollection.getCPtr(collection), collection, name, fileName), true);
}
public MapStyle(IMapStylesCollection collection, String fileName) {
this(OsmAndCoreJNI.new_MapStyle__SWIG_2(IMapStylesCollection.getCPtr(collection), collection, fileName), true);
}
public IMapStylesCollection getCollection() {
long cPtr = OsmAndCoreJNI.MapStyle_collection_get(swigCPtr, this);
return (cPtr == 0) ? null : new IMapStylesCollection(cPtr, true);
}
public boolean isMetadataLoaded() {
return OsmAndCoreJNI.MapStyle_isMetadataLoaded(swigCPtr, this);
}
public boolean loadMetadata() {
return OsmAndCoreJNI.MapStyle_loadMetadata(swigCPtr, this);
}
public String getTitle() {
return OsmAndCoreJNI.MapStyle_title_get(swigCPtr, this);
}
public String getName() {
return OsmAndCoreJNI.MapStyle_name_get(swigCPtr, this);
}
public String getParentName() {
return OsmAndCoreJNI.MapStyle_parentName_get(swigCPtr, this);
}
public boolean isStandalone() {
return OsmAndCoreJNI.MapStyle_isStandalone(swigCPtr, this);
}
public boolean isLoaded() {
return OsmAndCoreJNI.MapStyle_isLoaded(swigCPtr, this);
}
public boolean load() {
return OsmAndCoreJNI.MapStyle_load(swigCPtr, this);
}
public boolean resolveValueDefinition(String name, MapStyleValueDefinition outDefinition) {
return OsmAndCoreJNI.MapStyle_resolveValueDefinition(swigCPtr, this, name, MapStyleValueDefinition.getCPtr(outDefinition), outDefinition);
}
public boolean resolveAttribute(String name, MapStyleRule outAttribute) {
return OsmAndCoreJNI.MapStyle_resolveAttribute(swigCPtr, this, name, MapStyleRule.getCPtr(outAttribute), outAttribute);
}
public void dump(String prefix) {
OsmAndCoreJNI.MapStyle_dump__SWIG_0(swigCPtr, this, prefix);
}
public void dump() {
OsmAndCoreJNI.MapStyle_dump__SWIG_1(swigCPtr, this);
}
public void dump(MapStyleRulesetType type, String prefix) {
OsmAndCoreJNI.MapStyle_dump__SWIG_2(swigCPtr, this, type.swigValue(), prefix);
}
public void dump(MapStyleRulesetType type) {
OsmAndCoreJNI.MapStyle_dump__SWIG_3(swigCPtr, this, type.swigValue());
}
public static MapStyleBuiltinValueDefinitions getBuiltinValueDefinitions() {
long cPtr = OsmAndCoreJNI.MapStyle_getBuiltinValueDefinitions();
return (cPtr == 0) ? null : new MapStyleBuiltinValueDefinitions(cPtr, true);
}
}

44
OsmAnd/src/net/osmand/core/jni/MapStyleBuiltinValueDefinitions.java
View file

@ -35,4 +35,48 @@ public class MapStyleBuiltinValueDefinitions {
}
}
static public class MapStyleBuiltinValueDefinition extends MapStyleValueDefinition {
private long swigCPtr;
private boolean swigCMemOwnDerived;
protected MapStyleBuiltinValueDefinition(long cPtr, boolean cMemoryOwn) {
super(OsmAndCoreJNI.MapStyleBuiltinValueDefinitions_MapStyleBuiltinValueDefinition_SWIGSmartPtrUpcast(cPtr), true);
swigCMemOwnDerived = cMemoryOwn;
swigCPtr = cPtr;
}
protected static long getCPtr(MapStyleBuiltinValueDefinition obj) {
return (obj == null) ? 0 : obj.swigCPtr;
}
protected void finalize() {
delete();
}
public synchronized void delete() {
if (swigCPtr != 0) {
if (swigCMemOwnDerived) {
swigCMemOwnDerived = false;
OsmAndCoreJNI.delete_MapStyleBuiltinValueDefinitions_MapStyleBuiltinValueDefinition(swigCPtr);
}
swigCPtr = 0;
}
super.delete();
}
public int getId() {
return OsmAndCoreJNI.MapStyleBuiltinValueDefinitions_MapStyleBuiltinValueDefinition_id_get(swigCPtr, this);
}
}
public static MapStyleBuiltinValueDefinitions get() {
long cPtr = OsmAndCoreJNI.MapStyleBuiltinValueDefinitions_get();
return (cPtr == 0) ? null : new MapStyleBuiltinValueDefinitions(cPtr, true);
}
public int getLastBuiltinValueDefinitionId() {
return OsmAndCoreJNI.MapStyleBuiltinValueDefinitions_lastBuiltinValueDefinitionId_get(swigCPtr, this);
}
}

62
OsmAnd/src/net/osmand/core/jni/MapStyleConstantValue.java Normal file
View file

@ -0,0 +1,62 @@
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
* Version 3.0.3
*
* Do not make changes to this file unless you know what you are doing--modify
* the SWIG interface file instead.
* ----------------------------------------------------------------------------- */
package net.osmand.core.jni;
public class MapStyleConstantValue {
private long swigCPtr;
private boolean swigCMemOwn;
protected MapStyleConstantValue(long cPtr, boolean cMemoryOwn) {
swigCMemOwn = cMemoryOwn;
swigCPtr = cPtr;
}
protected static long getCPtr(MapStyleConstantValue obj) {
return (obj == null) ? 0 : obj.swigCPtr;
}
protected void finalize() {
delete();
}
public synchronized void delete() {
if (swigCPtr != 0) {
if (swigCMemOwn) {
swigCMemOwn = false;
OsmAndCoreJNI.delete_MapStyleConstantValue(swigCPtr);
}
swigCPtr = 0;
}
}
public MapStyleConstantValue() {
this(OsmAndCoreJNI.new_MapStyleConstantValue(), true);
}
public void setIsComplex(boolean value) {
OsmAndCoreJNI.MapStyleConstantValue_isComplex_set(swigCPtr, this, value);
}
public boolean getIsComplex() {
return OsmAndCoreJNI.MapStyleConstantValue_isComplex_get(swigCPtr, this);
}
public static boolean parse(String input, MapStyleValueDataType dataType, boolean isComplex, MapStyleConstantValue outValue) {
return OsmAndCoreJNI.MapStyleConstantValue_parse(input, dataType.swigValue(), isComplex, MapStyleConstantValue.getCPtr(outValue), outValue);
}
public static MapStyleConstantValue fromSimpleUInt(long input) {
return new MapStyleConstantValue(OsmAndCoreJNI.MapStyleConstantValue_fromSimpleUInt(input), true);
}
public String toString(MapStyleValueDataType dataType) {
return OsmAndCoreJNI.MapStyleConstantValue_toString(swigCPtr, this, dataType.swigValue());
}
}

51
OsmAnd/src/net/osmand/core/jni/MapStyleRule.java
View file

@ -1,51 +0,0 @@
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
* Version 3.0.3
*
* Do not make changes to this file unless you know what you are doing--modify
* the SWIG interface file instead.
* ----------------------------------------------------------------------------- */
package net.osmand.core.jni;
public class MapStyleRule {
private long swigCPtr;
private boolean swigCMemOwn;
protected MapStyleRule(long cPtr, boolean cMemoryOwn) {
swigCMemOwn = cMemoryOwn;
swigCPtr = cPtr;
}
protected static long getCPtr(MapStyleRule obj) {
return (obj == null) ? 0 : obj.swigCPtr;
}
protected void finalize() {
delete();
}
public synchronized void delete() {
if (swigCPtr != 0) {
if (swigCMemOwn) {
swigCMemOwn = false;
OsmAndCoreJNI.delete_MapStyleRule(swigCPtr);
}
swigCPtr = 0;
}
}
public MapStyle getOwner() {
long cPtr = OsmAndCoreJNI.MapStyleRule_owner_get(swigCPtr, this);
return (cPtr == 0) ? null : new MapStyle(cPtr, true);
}
public void dump(String prefix) {
OsmAndCoreJNI.MapStyleRule_dump__SWIG_0(swigCPtr, this, prefix);
}
public void dump() {
OsmAndCoreJNI.MapStyleRule_dump__SWIG_1(swigCPtr, this);
}
}

11
OsmAnd/src/net/osmand/core/jni/MapStyleRulesetType.java
View file

@ -10,11 +10,12 @@ package net.osmand.core.jni;
public enum MapStyleRulesetType {
Invalid(OsmAndCoreJNI.MapStyleRulesetType_Invalid_get()),
Point(OsmAndCoreJNI.MapStyleRulesetType_Point_get()),
Polyline(OsmAndCoreJNI.MapStyleRulesetType_Polyline_get()),
Polygon(OsmAndCoreJNI.MapStyleRulesetType_Polygon_get()),
Text(OsmAndCoreJNI.MapStyleRulesetType_Text_get()),
Order(OsmAndCoreJNI.MapStyleRulesetType_Order_get());
Point,
Polyline,
Polygon,
Text,
Order,
__LAST;
public final int swigValue() {
return swigValue;

50
OsmAnd/src/net/osmand/core/jni/MapStyleValue.java
View file

@ -1,50 +0,0 @@
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
* Version 3.0.3
*
* Do not make changes to this file unless you know what you are doing--modify
* the SWIG interface file instead.
* ----------------------------------------------------------------------------- */
package net.osmand.core.jni;
public class MapStyleValue {
private long swigCPtr;
private boolean swigCMemOwn;
protected MapStyleValue(long cPtr, boolean cMemoryOwn) {
swigCMemOwn = cMemoryOwn;
swigCPtr = cPtr;
}
protected static long getCPtr(MapStyleValue obj) {
return (obj == null) ? 0 : obj.swigCPtr;
}
protected void finalize() {
delete();
}
public synchronized void delete() {
if (swigCPtr != 0) {
if (swigCMemOwn) {
swigCMemOwn = false;
OsmAndCoreJNI.delete_MapStyleValue(swigCPtr);
}
swigCPtr = 0;
}
}
public MapStyleValue() {
this(OsmAndCoreJNI.new_MapStyleValue(), true);
}
public void setIsComplex(boolean value) {
OsmAndCoreJNI.MapStyleValue_isComplex_set(swigCPtr, this, value);
}
public boolean getIsComplex() {
return OsmAndCoreJNI.MapStyleValue_isComplex_get(swigCPtr, this);
}
}

52
OsmAnd/src/net/osmand/core/jni/MapStyleValueClass.java
View file

@ -1,52 +0,0 @@
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
* Version 3.0.3
*
* Do not make changes to this file unless you know what you are doing--modify
* the SWIG interface file instead.
* ----------------------------------------------------------------------------- */
package net.osmand.core.jni;
public enum MapStyleValueClass {
Input,
Output;
public final int swigValue() {
return swigValue;
}
public static MapStyleValueClass swigToEnum(int swigValue) {
MapStyleValueClass[] swigValues = MapStyleValueClass.class.getEnumConstants();
if (swigValue < swigValues.length && swigValue >= 0 && swigValues[swigValue].swigValue == swigValue)
return swigValues[swigValue];
for (MapStyleValueClass swigEnum : swigValues)
if (swigEnum.swigValue == swigValue)
return swigEnum;
throw new IllegalArgumentException("No enum " + MapStyleValueClass.class + " with value " + swigValue);
}
@SuppressWarnings("unused")
private MapStyleValueClass() {
this.swigValue = SwigNext.next++;
}
@SuppressWarnings("unused")
private MapStyleValueClass(int swigValue) {
this.swigValue = swigValue;
SwigNext.next = swigValue+1;
}
@SuppressWarnings("unused")
private MapStyleValueClass(MapStyleValueClass swigEnum) {
this.swigValue = swigEnum.swigValue;
SwigNext.next = this.swigValue+1;
}
private final int swigValue;
private static class SwigNext {
private static int next = 0;
}
}

50
OsmAnd/src/net/osmand/core/jni/MapStyleValueDefinition.java
View file

@ -35,12 +35,12 @@ public class MapStyleValueDefinition {
}
}
public int getId() {
return OsmAndCoreJNI.MapStyleValueDefinition_id_get(swigCPtr, this);
public MapStyleValueDefinition(MapStyleValueDefinition.Class valueClass, MapStyleValueDataType dataType, String name, boolean isComplex) {
this(OsmAndCoreJNI.new_MapStyleValueDefinition(valueClass.swigValue(), dataType.swigValue(), name, isComplex), true);
}
public MapStyleValueClass getValueClass() {
return MapStyleValueClass.swigToEnum(OsmAndCoreJNI.MapStyleValueDefinition_valueClass_get(swigCPtr, this));
public MapStyleValueDefinition.Class getValueClass() {
return MapStyleValueDefinition.Class.swigToEnum(OsmAndCoreJNI.MapStyleValueDefinition_valueClass_get(swigCPtr, this));
}
public MapStyleValueDataType getDataType() {
@ -55,4 +55,46 @@ public class MapStyleValueDefinition {
return OsmAndCoreJNI.MapStyleValueDefinition_isComplex_get(swigCPtr, this);
}
public enum Class {
Input,
Output;
public final int swigValue() {
return swigValue;
}
public static Class swigToEnum(int swigValue) {
Class[] swigValues = Class.class.getEnumConstants();
if (swigValue < swigValues.length && swigValue >= 0 && swigValues[swigValue].swigValue == swigValue)
return swigValues[swigValue];
for (Class swigEnum : swigValues)
if (swigEnum.swigValue == swigValue)
return swigEnum;
throw new IllegalArgumentException("No enum " + Class.class + " with value " + swigValue);
}
@SuppressWarnings("unused")
private Class() {
this.swigValue = SwigNext.next++;
}
@SuppressWarnings("unused")
private Class(int swigValue) {
this.swigValue = swigValue;
SwigNext.next = swigValue+1;
}
@SuppressWarnings("unused")
private Class(Class swigEnum) {
this.swigValue = swigEnum.swigValue;
SwigNext.next = this.swigValue+1;
}
private final int swigValue;
private static class SwigNext {
private static int next = 0;
}
}
}

18
OsmAnd/src/net/osmand/core/jni/MapStylesCollection.java
View file

@ -41,21 +41,21 @@ public class MapStylesCollection extends IMapStylesCollection {
this(OsmAndCoreJNI.new_MapStylesCollection(), true);
}
public boolean registerStyle(String filePath) {
return OsmAndCoreJNI.MapStylesCollection_registerStyle(swigCPtr, this, filePath);
public boolean addStyleFromFile(String filePath) {
return OsmAndCoreJNI.MapStylesCollection_addStyleFromFile(swigCPtr, this, filePath);
}
public SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__MapStyle_const_t_t getCollection() {
return new SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__MapStyle_const_t_t(OsmAndCoreJNI.MapStylesCollection_getCollection(swigCPtr, this), true);
public SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__UnresolvedMapStyle_const_t_t getCollection() {
return new SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__UnresolvedMapStyle_const_t_t(OsmAndCoreJNI.MapStylesCollection_getCollection(swigCPtr, this), true);
}
public MapStyle getAsIsStyle(String name) {
long cPtr = OsmAndCoreJNI.MapStylesCollection_getAsIsStyle(swigCPtr, this, name);
return (cPtr == 0) ? null : new MapStyle(cPtr, true);
public SWIGTYPE_p_std__shared_ptrT_OsmAnd__UnresolvedMapStyle_const_t getStyleByName(String name) {
return new SWIGTYPE_p_std__shared_ptrT_OsmAnd__UnresolvedMapStyle_const_t(OsmAndCoreJNI.MapStylesCollection_getStyleByName(swigCPtr, this, name), true);
}
public boolean obtainBakedStyle(String name, MapStyle outStyle) {
return OsmAndCoreJNI.MapStylesCollection_obtainBakedStyle(swigCPtr, this, name, MapStyle.getCPtr(outStyle), outStyle);
public ResolvedMapStyle getResolvedStyleByName(String name) {
long cPtr = OsmAndCoreJNI.MapStylesCollection_getResolvedStyleByName(swigCPtr, this, name);
return (cPtr == 0) ? null : new ResolvedMapStyle(cPtr, true);
}
}

8
OsmAnd/src/net/osmand/core/jni/MapSymbol.java
View file

@ -73,14 +73,6 @@ public class MapSymbol {
return new SWIGTYPE_p_QSetT_int_t(OsmAndCoreJNI.MapSymbol_intersectsWithClasses_get(swigCPtr, this), true);
}
public void setIntersectedByClasses(SWIGTYPE_p_QSetT_int_t value) {
OsmAndCoreJNI.MapSymbol_intersectedByClasses_set(swigCPtr, this, SWIGTYPE_p_QSetT_int_t.getCPtr(value));
}
public SWIGTYPE_p_QSetT_int_t getIntersectedByClasses() {
return new SWIGTYPE_p_QSetT_int_t(OsmAndCoreJNI.MapSymbol_intersectedByClasses_get(swigCPtr, this), true);
}
public void setIsHidden(boolean value) {
OsmAndCoreJNI.MapSymbol_isHidden_set(swigCPtr, this, value);
}

2
OsmAnd/src/net/osmand/core/jni/OsmAndCoreConstants.java
View file

@ -14,6 +14,8 @@ public interface OsmAndCoreConstants {
public final static int RoutingDataLevelsCount = OsmAndCoreJNI.RoutingDataLevelsCount_get();
public final static int MapStyleRulesetTypesCount = OsmAndCoreJNI.MapStyleRulesetTypesCount_get();
public final static int RasterMapLayersCount = OsmAndCoreJNI.RasterMapLayersCount_get();
}

171
OsmAnd/src/net/osmand/core/jni/OsmAndCoreJNI.java
View file

@ -51,6 +51,8 @@ public class OsmAndCoreJNI {
public final static native long SwigUtilities_readEntireFile(String jarg1);
public final static native long SwigUtilities_readPartOfFile(String jarg1, long jarg2, long jarg3);
public final static native long SwigUtilities_emptyQByteArray();
public final static native long SwigUtilities_qDecompress(long jarg1);
public final static native long SwigUtilities_createSkBitmapARGB888With(long jarg1, long jarg2, long jarg3, long jarg4);
public final static native int OSMAND_DEBUG_get();
public final static native boolean InitializeCore(long jarg1, ICoreResourcesProvider jarg1_);
public final static native long getCoreResourcesProvider();
@ -110,8 +112,9 @@ public class OsmAndCoreJNI {
public final static native long FColorRGB_withAlpha(long jarg1, FColorRGB jarg1_, float jarg2);
public final static native void delete_FColorRGB(long jarg1);
public final static native long new_ColorARGB__SWIG_0();
public final static native long new_ColorARGB__SWIG_1(short jarg1, short jarg2, short jarg3, short jarg4);
public final static native long new_ColorARGB__SWIG_2(long jarg1, FColorARGB jarg1_);
public final static native long new_ColorARGB__SWIG_1(long jarg1);
public final static native long new_ColorARGB__SWIG_2(short jarg1, short jarg2, short jarg3, short jarg4);
public final static native long new_ColorARGB__SWIG_3(long jarg1, FColorARGB jarg1_);
public final static native void ColorARGB_a_set(long jarg1, ColorARGB jarg1_, short jarg2);
public final static native short ColorARGB_a_get(long jarg1, ColorARGB jarg1_);
public final static native void ColorARGB_r_set(long jarg1, ColorARGB jarg1_, short jarg2);
@ -289,6 +292,7 @@ public class OsmAndCoreJNI {
public final static native boolean MapRendererStateChanges_isSet(long jarg1, MapRendererStateChanges jarg1_, int jarg2);
public final static native long MapRendererStateChanges_set(long jarg1, MapRendererStateChanges jarg1_, int jarg2);
public final static native long MapRendererStateChanges_unset(long jarg1, MapRendererStateChanges jarg1_, int jarg2);
public final static native long MapRendererStateChanges_unite(long jarg1, MapRendererStateChanges jarg1_, long jarg2);
public final static native void delete_IObfsCollection(long jarg1);
public final static native long IObfsCollection_getObfFiles(long jarg1, IObfsCollection jarg1_);
public final static native long IObfsCollection_obtainDataInterface(long jarg1, IObfsCollection jarg1_);
@ -351,7 +355,7 @@ public class OsmAndCoreJNI {
public final static native long new_ResourcesManager_ObfMetadata(long jarg1, ObfFile jarg1_);
public final static native void delete_ResourcesManager_ObfMetadata(long jarg1);
public final static native long ResourcesManager_ObfMetadata_obfFile_get(long jarg1, ResourcesManager.ObfMetadata jarg1_);
public final static native long new_ResourcesManager_MapStyleMetadata(long jarg1, MapStyle jarg1_);
public final static native long new_ResourcesManager_MapStyleMetadata(long jarg1);
public final static native void delete_ResourcesManager_MapStyleMetadata(long jarg1);
public final static native long ResourcesManager_MapStyleMetadata_mapStyle_get(long jarg1, ResourcesManager.MapStyleMetadata jarg1_);
public final static native long new_ResourcesManager_MapStylesPresetsMetadata(long jarg1, MapStylesPresetsCollection jarg1_);
@ -504,12 +508,7 @@ public class OsmAndCoreJNI {
public final static native double Utilities_getMetersPerTileUnit(float jarg1, double jarg2, double jarg3);
public final static native long Utilities_normalizeTileId(long jarg1, TileId jarg1_, int jarg2);
public final static native long Utilities_normalizeCoordinates(long jarg1, PointI jarg1_, int jarg2);
public final static native int Utilities_CHCode_Inside_get();
public final static native int Utilities_CHCode_Left_get();
public final static native int Utilities_CHCode_Right_get();
public final static native int Utilities_CHCode_Bottom_get();
public final static native int Utilities_CHCode_Top_get();
public final static native short Utilities_computeCohenSutherlandCode(long jarg1, PointI jarg1_, long jarg2, AreaI jarg2_);
public final static native boolean Utilities_extractFirstNumberPosition(String jarg1, long jarg2, long jarg3, boolean jarg4, boolean jarg5);
public final static native double Utilities_parseSpeed__SWIG_0(String jarg1, double jarg2, long jarg3);
public final static native double Utilities_parseSpeed__SWIG_1(String jarg1, double jarg2);
@ -575,6 +574,19 @@ public class OsmAndCoreJNI {
public final static native long ObfInfo_poiSections_get(long jarg1, ObfInfo jarg1_);
public final static native long ObfInfo_transportSections_get(long jarg1, ObfInfo jarg1_);
public final static native int MapFoundationType_Undefined_get();
public final static native int MapStyleRulesetType_Invalid_get();
public final static native int MapStyleRulesetTypesCount_get();
public final static native int RasterMapLayerId_Invalid_get();
public final static native int RasterMapLayersCount_get();
public final static native void TagValueId_id_set(long jarg1, TagValueId jarg1_, java.math.BigInteger jarg2);
public final static native java.math.BigInteger TagValueId_id_get(long jarg1, TagValueId jarg1_);
public final static native void TagValueId_tagId_set(long jarg1, TagValueId jarg1_, int jarg2);
public final static native int TagValueId_tagId_get(long jarg1, TagValueId jarg1_);
public final static native void TagValueId_valueId_set(long jarg1, TagValueId jarg1_, int jarg2);
public final static native int TagValueId_valueId_get(long jarg1, TagValueId jarg1_);
public final static native long TagValueId_compose(int jarg1, int jarg2);
public final static native long new_TagValueId();
public final static native void delete_TagValueId(long jarg1);
public final static native int MapSymbol_ContentClass_Unknown_get();
public final static native void delete_MapSymbol(long jarg1);
public final static native long MapSymbol_group_get(long jarg1, MapSymbol jarg1_);
@ -586,8 +598,6 @@ public class OsmAndCoreJNI {
public final static native int MapSymbol_contentClass_get(long jarg1, MapSymbol jarg1_);
public final static native void MapSymbol_intersectsWithClasses_set(long jarg1, MapSymbol jarg1_, long jarg2);
public final static native long MapSymbol_intersectsWithClasses_get(long jarg1, MapSymbol jarg1_);
public final static native void MapSymbol_intersectedByClasses_set(long jarg1, MapSymbol jarg1_, long jarg2);
public final static native long MapSymbol_intersectedByClasses_get(long jarg1, MapSymbol jarg1_);
public final static native void MapSymbol_isHidden_set(long jarg1, MapSymbol jarg1_, boolean jarg2);
public final static native boolean MapSymbol_isHidden_get(long jarg1, MapSymbol jarg1_);
public final static native void MapSymbol_modulationColor_set(long jarg1, MapSymbol jarg1_, long jarg2, FColorARGB jarg2_);
@ -647,15 +657,14 @@ public class OsmAndCoreJNI {
public final static native long MapSymbolsGroup_additionalInstances_get(long jarg1, MapSymbolsGroup jarg1_);
public final static native void delete_IMapStylesCollection(long jarg1);
public final static native long IMapStylesCollection_getCollection(long jarg1, IMapStylesCollection jarg1_);
public final static native long IMapStylesCollection_getAsIsStyle(long jarg1, IMapStylesCollection jarg1_, String jarg2);
public final static native boolean IMapStylesCollection_obtainBakedStyle(long jarg1, IMapStylesCollection jarg1_, String jarg2, long jarg3, MapStyle jarg3_);
public final static native long IMapStylesCollection_getBakedStyle(long jarg1, IMapStylesCollection jarg1_, String jarg2);
public final static native long IMapStylesCollection_getStyleByName(long jarg1, IMapStylesCollection jarg1_, String jarg2);
public final static native long IMapStylesCollection_getResolvedStyleByName(long jarg1, IMapStylesCollection jarg1_, String jarg2);
public final static native long new_MapStylesCollection();
public final static native void delete_MapStylesCollection(long jarg1);
public final static native boolean MapStylesCollection_registerStyle(long jarg1, MapStylesCollection jarg1_, String jarg2);
public final static native boolean MapStylesCollection_addStyleFromFile(long jarg1, MapStylesCollection jarg1_, String jarg2);
public final static native long MapStylesCollection_getCollection(long jarg1, MapStylesCollection jarg1_);
public final static native long MapStylesCollection_getAsIsStyle(long jarg1, MapStylesCollection jarg1_, String jarg2);
public final static native boolean MapStylesCollection_obtainBakedStyle(long jarg1, MapStylesCollection jarg1_, String jarg2, long jarg3, MapStyle jarg3_);
public final static native long MapStylesCollection_getStyleByName(long jarg1, MapStylesCollection jarg1_, String jarg2);
public final static native long MapStylesCollection_getResolvedStyleByName(long jarg1, MapStylesCollection jarg1_, String jarg2);
public final static native void delete_IMapStylesPresetsCollection(long jarg1);
public final static native long IMapStylesPresetsCollection_getCollection(long jarg1, IMapStylesPresetsCollection jarg1_);
public final static native long IMapStylesPresetsCollection_getCollectionFor(long jarg1, IMapStylesPresetsCollection jarg1_, String jarg2);
@ -672,47 +681,78 @@ public class OsmAndCoreJNI {
public final static native long MapStylesPresetsCollection_getCollection__SWIG_0(long jarg1, MapStylesPresetsCollection jarg1_);
public final static native long MapStylesPresetsCollection_getCollectionFor__SWIG_0(long jarg1, MapStylesPresetsCollection jarg1_, String jarg2);
public final static native long MapStylesPresetsCollection_getPreset__SWIG_0(long jarg1, MapStylesPresetsCollection jarg1_, String jarg2, String jarg3);
public final static native void delete_MapStyleBuiltinValueDefinitions(long jarg1);
public final static native int MapStyleRulesetType_Invalid_get();
public final static native int MapStyleRulesetType_Point_get();
public final static native int MapStyleRulesetType_Polyline_get();
public final static native int MapStyleRulesetType_Polygon_get();
public final static native int MapStyleRulesetType_Text_get();
public final static native int MapStyleRulesetType_Order_get();
public final static native long new_MapStyle__SWIG_0(long jarg1, IMapStylesCollection jarg1_, String jarg2, long jarg3);
public final static native long new_MapStyle__SWIG_1(long jarg1, IMapStylesCollection jarg1_, String jarg2, String jarg3);
public final static native long new_MapStyle__SWIG_2(long jarg1, IMapStylesCollection jarg1_, String jarg2);
public final static native void delete_MapStyle(long jarg1);
public final static native long MapStyle_collection_get(long jarg1, MapStyle jarg1_);
public final static native boolean MapStyle_isMetadataLoaded(long jarg1, MapStyle jarg1_);
public final static native boolean MapStyle_loadMetadata(long jarg1, MapStyle jarg1_);
public final static native String MapStyle_title_get(long jarg1, MapStyle jarg1_);
public final static native String MapStyle_name_get(long jarg1, MapStyle jarg1_);
public final static native String MapStyle_parentName_get(long jarg1, MapStyle jarg1_);
public final static native boolean MapStyle_isStandalone(long jarg1, MapStyle jarg1_);
public final static native boolean MapStyle_isLoaded(long jarg1, MapStyle jarg1_);
public final static native boolean MapStyle_load(long jarg1, MapStyle jarg1_);
public final static native boolean MapStyle_resolveValueDefinition(long jarg1, MapStyle jarg1_, String jarg2, long jarg3, MapStyleValueDefinition jarg3_);
public final static native boolean MapStyle_resolveAttribute(long jarg1, MapStyle jarg1_, String jarg2, long jarg3, MapStyleRule jarg3_);
public final static native void MapStyle_dump__SWIG_0(long jarg1, MapStyle jarg1_, String jarg2);
public final static native void MapStyle_dump__SWIG_1(long jarg1, MapStyle jarg1_);
public final static native void MapStyle_dump__SWIG_2(long jarg1, MapStyle jarg1_, int jarg2, String jarg3);
public final static native void MapStyle_dump__SWIG_3(long jarg1, MapStyle jarg1_, int jarg2);
public final static native long MapStyle_getBuiltinValueDefinitions();
public final static native void delete_MapStyleRule(long jarg1);
public final static native long MapStyleRule_owner_get(long jarg1, MapStyleRule jarg1_);
public final static native void MapStyleRule_dump__SWIG_0(long jarg1, MapStyleRule jarg1_, String jarg2);
public final static native void MapStyleRule_dump__SWIG_1(long jarg1, MapStyleRule jarg1_);
public final static native long new_MapStyleConstantValue();
public final static native void delete_MapStyleConstantValue(long jarg1);
public final static native void MapStyleConstantValue_isComplex_set(long jarg1, MapStyleConstantValue jarg1_, boolean jarg2);
public final static native boolean MapStyleConstantValue_isComplex_get(long jarg1, MapStyleConstantValue jarg1_);
public final static native boolean MapStyleConstantValue_parse(String jarg1, int jarg2, boolean jarg3, long jarg4, MapStyleConstantValue jarg4_);
public final static native long MapStyleConstantValue_fromSimpleUInt(long jarg1);
public final static native String MapStyleConstantValue_toString(long jarg1, MapStyleConstantValue jarg1_, int jarg2);
public final static native long new_MapStyleValueDefinition(int jarg1, int jarg2, String jarg3, boolean jarg4);
public final static native void delete_MapStyleValueDefinition(long jarg1);
public final static native int MapStyleValueDefinition_id_get(long jarg1, MapStyleValueDefinition jarg1_);
public final static native int MapStyleValueDefinition_valueClass_get(long jarg1, MapStyleValueDefinition jarg1_);
public final static native int MapStyleValueDefinition_dataType_get(long jarg1, MapStyleValueDefinition jarg1_);
public final static native String MapStyleValueDefinition_name_get(long jarg1, MapStyleValueDefinition jarg1_);
public final static native boolean MapStyleValueDefinition_isComplex_get(long jarg1, MapStyleValueDefinition jarg1_);
public final static native long new_MapStyleValue();
public final static native void MapStyleValue_isComplex_set(long jarg1, MapStyleValue jarg1_, boolean jarg2);
public final static native boolean MapStyleValue_isComplex_get(long jarg1, MapStyleValue jarg1_);
public final static native void delete_MapStyleValue(long jarg1);
public final static native void delete_MapStyleBuiltinValueDefinitions_MapStyleBuiltinValueDefinition(long jarg1);
public final static native int MapStyleBuiltinValueDefinitions_MapStyleBuiltinValueDefinition_id_get(long jarg1, MapStyleBuiltinValueDefinitions.MapStyleBuiltinValueDefinition jarg1_);
public final static native void delete_MapStyleBuiltinValueDefinitions(long jarg1);
public final static native long MapStyleBuiltinValueDefinitions_get();
public final static native int MapStyleBuiltinValueDefinitions_lastBuiltinValueDefinitionId_get(long jarg1, MapStyleBuiltinValueDefinitions jarg1_);
public final static native int ResolvedMapStyle_EmptyStringId_get();
public final static native long new_ResolvedMapStyle_ResolvedValue();
public final static native void delete_ResolvedMapStyle_ResolvedValue(long jarg1);
public final static native void ResolvedMapStyle_ResolvedValue_isDynamic_set(long jarg1, ResolvedMapStyle.ResolvedValue jarg1_, boolean jarg2);
public final static native boolean ResolvedMapStyle_ResolvedValue_isDynamic_get(long jarg1, ResolvedMapStyle.ResolvedValue jarg1_);
public final static native void ResolvedMapStyle_ResolvedValue_asConstantValue_set(long jarg1, ResolvedMapStyle.ResolvedValue jarg1_, long jarg2, MapStyleConstantValue jarg2_);
public final static native long ResolvedMapStyle_ResolvedValue_asConstantValue_get(long jarg1, ResolvedMapStyle.ResolvedValue jarg1_);
public final static native long ResolvedMapStyle_ResolvedValue_fromConstantValue(long jarg1, MapStyleConstantValue jarg1_);
public final static native long ResolvedMapStyle_ResolvedValue_fromAttribute(long jarg1);
public final static native long new_ResolvedMapStyle_RuleNode(boolean jarg1);
public final static native void delete_ResolvedMapStyle_RuleNode(long jarg1);
public final static native boolean ResolvedMapStyle_RuleNode_applyOnlyIfOneOfConditionalsAccepted_get(long jarg1, ResolvedMapStyle.RuleNode jarg1_);
public final static native void ResolvedMapStyle_RuleNode_values_set(long jarg1, ResolvedMapStyle.RuleNode jarg1_, long jarg2);
public final static native long ResolvedMapStyle_RuleNode_values_get(long jarg1, ResolvedMapStyle.RuleNode jarg1_);
public final static native void ResolvedMapStyle_RuleNode_oneOfConditionalSubnodes_set(long jarg1, ResolvedMapStyle.RuleNode jarg1_, long jarg2);
public final static native long ResolvedMapStyle_RuleNode_oneOfConditionalSubnodes_get(long jarg1, ResolvedMapStyle.RuleNode jarg1_);
public final static native void ResolvedMapStyle_RuleNode_applySubnodes_set(long jarg1, ResolvedMapStyle.RuleNode jarg1_, long jarg2);
public final static native long ResolvedMapStyle_RuleNode_applySubnodes_get(long jarg1, ResolvedMapStyle.RuleNode jarg1_);
public final static native void delete_ResolvedMapStyle_BaseRule(long jarg1);
public final static native long ResolvedMapStyle_BaseRule_rootNode_get(long jarg1, ResolvedMapStyle.BaseRule jarg1_);
public final static native long new_ResolvedMapStyle_Rule(int jarg1);
public final static native void delete_ResolvedMapStyle_Rule(long jarg1);
public final static native int ResolvedMapStyle_Rule_rulesetType_get(long jarg1, ResolvedMapStyle.Rule jarg1_);
public final static native long new_ResolvedMapStyle_Attribute(long jarg1);
public final static native void delete_ResolvedMapStyle_Attribute(long jarg1);
public final static native long ResolvedMapStyle_Attribute_nameId_get(long jarg1, ResolvedMapStyle.Attribute jarg1_);
public final static native long new_ResolvedMapStyle_Parameter(String jarg1, String jarg2, long jarg3, int jarg4, long jarg5);
public final static native void delete_ResolvedMapStyle_Parameter(long jarg1);
public final static native void ResolvedMapStyle_Parameter_title_set(long jarg1, ResolvedMapStyle.Parameter jarg1_, String jarg2);
public final static native String ResolvedMapStyle_Parameter_title_get(long jarg1, ResolvedMapStyle.Parameter jarg1_);
public final static native void ResolvedMapStyle_Parameter_description_set(long jarg1, ResolvedMapStyle.Parameter jarg1_, String jarg2);
public final static native String ResolvedMapStyle_Parameter_description_get(long jarg1, ResolvedMapStyle.Parameter jarg1_);
public final static native void ResolvedMapStyle_Parameter_nameId_set(long jarg1, ResolvedMapStyle.Parameter jarg1_, long jarg2);
public final static native long ResolvedMapStyle_Parameter_nameId_get(long jarg1, ResolvedMapStyle.Parameter jarg1_);
public final static native void ResolvedMapStyle_Parameter_dataType_set(long jarg1, ResolvedMapStyle.Parameter jarg1_, int jarg2);
public final static native int ResolvedMapStyle_Parameter_dataType_get(long jarg1, ResolvedMapStyle.Parameter jarg1_);
public final static native void ResolvedMapStyle_Parameter_possibleValues_set(long jarg1, ResolvedMapStyle.Parameter jarg1_, long jarg2);
public final static native long ResolvedMapStyle_Parameter_possibleValues_get(long jarg1, ResolvedMapStyle.Parameter jarg1_);
public final static native long new_ResolvedMapStyle_ParameterValueDefinition(int jarg1, String jarg2, long jarg3);
public final static native void delete_ResolvedMapStyle_ParameterValueDefinition(long jarg1);
public final static native int ResolvedMapStyle_ParameterValueDefinition_id_get(long jarg1, ResolvedMapStyle.ParameterValueDefinition jarg1_);
public final static native long ResolvedMapStyle_ParameterValueDefinition_parameter_get(long jarg1, ResolvedMapStyle.ParameterValueDefinition jarg1_);
public final static native void delete_ResolvedMapStyle(long jarg1);
public final static native long ResolvedMapStyle_unresolvedMapStylesChain_get(long jarg1, ResolvedMapStyle jarg1_);
public final static native int ResolvedMapStyle_getValueDefinitionIdByName(long jarg1, ResolvedMapStyle jarg1_, String jarg2);
public final static native long ResolvedMapStyle_getValueDefinitionById(long jarg1, ResolvedMapStyle jarg1_, int jarg2);
public final static native boolean ResolvedMapStyle_parseValue__SWIG_0(long jarg1, ResolvedMapStyle jarg1_, String jarg2, int jarg3, long jarg4, MapStyleConstantValue jarg4_);
public final static native boolean ResolvedMapStyle_parseValue__SWIG_1(long jarg1, ResolvedMapStyle jarg1_, String jarg2, long jarg3, MapStyleValueDefinition jarg3_, long jarg4, MapStyleConstantValue jarg4_);
public final static native long ResolvedMapStyle_getAttribute(long jarg1, ResolvedMapStyle jarg1_, String jarg2);
public final static native long ResolvedMapStyle_getRuleset(long jarg1, ResolvedMapStyle jarg1_, int jarg2);
public final static native String ResolvedMapStyle_getStringById(long jarg1, ResolvedMapStyle jarg1_, long jarg2);
public final static native String ResolvedMapStyle_dump__SWIG_0(long jarg1, ResolvedMapStyle jarg1_, String jarg2);
public final static native String ResolvedMapStyle_dump__SWIG_1(long jarg1, ResolvedMapStyle jarg1_);
public final static native long ResolvedMapStyle_resolveMapStylesChain(long jarg1);
public final static native long new_MapStylePreset(int jarg1, String jarg2, String jarg3);
public final static native void delete_MapStylePreset(long jarg1);
public final static native int MapStylePreset_type_get(long jarg1, MapStylePreset jarg1_);
@ -720,15 +760,17 @@ public class OsmAndCoreJNI {
public final static native String MapStylePreset_styleName_get(long jarg1, MapStylePreset jarg1_);
public final static native void MapStylePreset_attributes_set(long jarg1, MapStylePreset jarg1_, long jarg2);
public final static native long MapStylePreset_attributes_get(long jarg1, MapStylePreset jarg1_);
public final static native long new_MapPresentationEnvironment__SWIG_0(long jarg1, MapStyle jarg1_, float jarg2, String jarg3, long jarg4, ICoreResourcesProvider jarg4_);
public final static native long new_MapPresentationEnvironment__SWIG_1(long jarg1, MapStyle jarg1_, float jarg2, String jarg3);
public final static native long new_MapPresentationEnvironment__SWIG_2(long jarg1, MapStyle jarg1_, float jarg2);
public final static native long new_MapPresentationEnvironment__SWIG_3(long jarg1, MapStyle jarg1_);
public final static native long new_MapPresentationEnvironment__SWIG_0(long jarg1, ResolvedMapStyle jarg1_, float jarg2, String jarg3, int jarg4, long jarg5, ICoreResourcesProvider jarg5_);
public final static native long new_MapPresentationEnvironment__SWIG_1(long jarg1, ResolvedMapStyle jarg1_, float jarg2, String jarg3, int jarg4);
public final static native long new_MapPresentationEnvironment__SWIG_2(long jarg1, ResolvedMapStyle jarg1_, float jarg2, String jarg3);
public final static native long new_MapPresentationEnvironment__SWIG_3(long jarg1, ResolvedMapStyle jarg1_, float jarg2);
public final static native long new_MapPresentationEnvironment__SWIG_4(long jarg1, ResolvedMapStyle jarg1_);
public final static native void delete_MapPresentationEnvironment(long jarg1);
public final static native long MapPresentationEnvironment_styleBuiltinValueDefs_get(long jarg1, MapPresentationEnvironment jarg1_);
public final static native long MapPresentationEnvironment_style_get(long jarg1, MapPresentationEnvironment jarg1_);
public final static native long MapPresentationEnvironment_resolvedStyle_get(long jarg1, MapPresentationEnvironment jarg1_);
public final static native float MapPresentationEnvironment_displayDensityFactor_get(long jarg1, MapPresentationEnvironment jarg1_);
public final static native String MapPresentationEnvironment_localeLanguageId_get(long jarg1, MapPresentationEnvironment jarg1_);
public final static native int MapPresentationEnvironment_languagePreference_get(long jarg1, MapPresentationEnvironment jarg1_);
public final static native long MapPresentationEnvironment_externalResourcesProvider_get(long jarg1, MapPresentationEnvironment jarg1_);
public final static native long MapPresentationEnvironment_dummyMapSection_get(long jarg1, MapPresentationEnvironment jarg1_);
public final static native long MapPresentationEnvironment_getSettings(long jarg1, MapPresentationEnvironment jarg1_);
@ -746,8 +788,6 @@ public class OsmAndCoreJNI {
public final static native long MapPresentationEnvironment_getRoadsDensityLimitPerTile(long jarg1, MapPresentationEnvironment jarg1_, int jarg2);
public final static native int MapPresentationEnvironment_DefaultShadowLevelMin_get();
public final static native int MapPresentationEnvironment_DefaultShadowLevelMax_get();
public final static native int RasterMapLayerId_Invalid_get();
public final static native int RasterMapLayersCount_get();
public final static native int MapRendererStateChange_RasterLayers_Providers_get();
public final static native long new_MapRendererState();
public final static native void delete_MapRendererState(long jarg1);
@ -882,6 +922,7 @@ public class OsmAndCoreJNI {
public final static native boolean IMapRenderer_renderFrame(long jarg1, IMapRenderer jarg1_);
public final static native boolean IMapRenderer_releaseRendering(long jarg1, IMapRenderer jarg1_);
public final static native boolean IMapRenderer_isIdle(long jarg1, IMapRenderer jarg1_);
public final static native String IMapRenderer_getNotIdleReason(long jarg1, IMapRenderer jarg1_);
public final static native boolean IMapRenderer_pauseGpuWorkerThread(long jarg1, IMapRenderer jarg1_);
public final static native boolean IMapRenderer_resumeGpuWorkerThread(long jarg1, IMapRenderer jarg1_);
public final static native long new_IMapRenderer_IFramePreparedObserver();
@ -1048,8 +1089,10 @@ public class OsmAndCoreJNI {
public final static native int Primitiviser_Primitive_type_get(long jarg1, Primitiviser.Primitive jarg1_);
public final static native long Primitiviser_Primitive_typeRuleIdIndex_get(long jarg1, Primitiviser.Primitive jarg1_);
public final static native long Primitiviser_Primitive_evaluationResult_get(long jarg1, Primitiviser.Primitive jarg1_);
public final static native void Primitiviser_Primitive_zOrder_set(long jarg1, Primitiviser.Primitive jarg1_, double jarg2);
public final static native double Primitiviser_Primitive_zOrder_get(long jarg1, Primitiviser.Primitive jarg1_);
public final static native void Primitiviser_Primitive_zOrder_set(long jarg1, Primitiviser.Primitive jarg1_, int jarg2);
public final static native int Primitiviser_Primitive_zOrder_get(long jarg1, Primitiviser.Primitive jarg1_);
public final static native void Primitiviser_Primitive_doubledArea_set(long jarg1, Primitiviser.Primitive jarg1_, long jarg2);
public final static native long Primitiviser_Primitive_doubledArea_get(long jarg1, Primitiviser.Primitive jarg1_);
public final static native void delete_Primitiviser_SymbolsGroup(long jarg1);
public final static native long Primitiviser_SymbolsGroup_sourceObject_get(long jarg1, Primitiviser.SymbolsGroup jarg1_);
public final static native void Primitiviser_SymbolsGroup_symbols_set(long jarg1, Primitiviser.SymbolsGroup jarg1_, long jarg2);
@ -1064,8 +1107,6 @@ public class OsmAndCoreJNI {
public final static native boolean Primitiviser_Symbol_drawAlongPath_get(long jarg1, Primitiviser.Symbol jarg1_);
public final static native void Primitiviser_Symbol_intersectsWith_set(long jarg1, Primitiviser.Symbol jarg1_, long jarg2);
public final static native long Primitiviser_Symbol_intersectsWith_get(long jarg1, Primitiviser.Symbol jarg1_);
public final static native void Primitiviser_Symbol_intersectedBy_set(long jarg1, Primitiviser.Symbol jarg1_, long jarg2);
public final static native long Primitiviser_Symbol_intersectedBy_get(long jarg1, Primitiviser.Symbol jarg1_);
public final static native void delete_Primitiviser_TextSymbol(long jarg1);
public final static native void Primitiviser_TextSymbol_value_set(long jarg1, Primitiviser.TextSymbol jarg1_, String jarg2);
public final static native String Primitiviser_TextSymbol_value_get(long jarg1, Primitiviser.TextSymbol jarg1_);
@ -1270,6 +1311,10 @@ public class OsmAndCoreJNI {
public final static native long MapSymbolsGroup_AdditionalOnPathSymbolInstanceParameters_SWIGUpcast(long jarg1);
public final static native long MapStylesCollection_SWIGSmartPtrUpcast(long jarg1);
public final static native long MapStylesPresetsCollection_SWIGSmartPtrUpcast(long jarg1);
public final static native long MapStyleBuiltinValueDefinitions_MapStyleBuiltinValueDefinition_SWIGSmartPtrUpcast(long jarg1);
public final static native long ResolvedMapStyle_Rule_SWIGUpcast(long jarg1);
public final static native long ResolvedMapStyle_Attribute_SWIGUpcast(long jarg1);
public final static native long ResolvedMapStyle_ParameterValueDefinition_SWIGSmartPtrUpcast(long jarg1);
public final static native long AtlasMapRendererConfiguration_SWIGSmartPtrUpcast(long jarg1);
public final static native long IMapTiledDataProvider_SWIGSmartPtrUpcast(long jarg1);
public final static native long MapTiledData_SWIGSmartPtrUpcast(long jarg1);

21
OsmAnd/src/net/osmand/core/jni/Primitiviser.java
View file

@ -145,14 +145,22 @@ public class Primitiviser {
return new SWIGTYPE_p_MapStyleEvaluationResult(OsmAndCoreJNI.Primitiviser_Primitive_evaluationResult_get(swigCPtr, this), true);
}
public void setZOrder(double value) {
public void setZOrder(int value) {
OsmAndCoreJNI.Primitiviser_Primitive_zOrder_set(swigCPtr, this, value);
}
public double getZOrder() {
public int getZOrder() {
return OsmAndCoreJNI.Primitiviser_Primitive_zOrder_get(swigCPtr, this);
}
public void setDoubledArea(long value) {
OsmAndCoreJNI.Primitiviser_Primitive_doubledArea_set(swigCPtr, this, value);
}
public long getDoubledArea() {
return OsmAndCoreJNI.Primitiviser_Primitive_doubledArea_get(swigCPtr, this);
}
}
static public class SymbolsGroup {
@ -264,15 +272,6 @@ public class Primitiviser {
return (cPtr == 0) ? null : new SWIGTYPE_p_QSetT_QString_t(cPtr, false);
}
public void setIntersectedBy(SWIGTYPE_p_QSetT_QString_t value) {
OsmAndCoreJNI.Primitiviser_Symbol_intersectedBy_set(swigCPtr, this, SWIGTYPE_p_QSetT_QString_t.getCPtr(value));
}
public SWIGTYPE_p_QSetT_QString_t getIntersectedBy() {
long cPtr = OsmAndCoreJNI.Primitiviser_Symbol_intersectedBy_get(swigCPtr, this);
return (cPtr == 0) ? null : new SWIGTYPE_p_QSetT_QString_t(cPtr, false);
}
}
static public class TextSymbol extends Primitiviser.Symbol {

434
OsmAnd/src/net/osmand/core/jni/ResolvedMapStyle.java Normal file
View file

@ -0,0 +1,434 @@
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
* Version 3.0.3
*
* Do not make changes to this file unless you know what you are doing--modify
* the SWIG interface file instead.
* ----------------------------------------------------------------------------- */
package net.osmand.core.jni;
public class ResolvedMapStyle {
private long swigCPtr;
private boolean swigCMemOwn;
protected ResolvedMapStyle(long cPtr, boolean cMemoryOwn) {
swigCMemOwn = cMemoryOwn;
swigCPtr = cPtr;
}
protected static long getCPtr(ResolvedMapStyle obj) {
return (obj == null) ? 0 : obj.swigCPtr;
}
protected void finalize() {
delete();
}
public synchronized void delete() {
if (swigCPtr != 0) {
if (swigCMemOwn) {
swigCMemOwn = false;
OsmAndCoreJNI.delete_ResolvedMapStyle(swigCPtr);
}
swigCPtr = 0;
}
}
static public class ResolvedValue {
private long swigCPtr;
protected boolean swigCMemOwn;
protected ResolvedValue(long cPtr, boolean cMemoryOwn) {
swigCMemOwn = cMemoryOwn;
swigCPtr = cPtr;
}
protected static long getCPtr(ResolvedValue obj) {
return (obj == null) ? 0 : obj.swigCPtr;
}
protected void finalize() {
delete();
}
public synchronized void delete() {
if (swigCPtr != 0) {
if (swigCMemOwn) {
swigCMemOwn = false;
OsmAndCoreJNI.delete_ResolvedMapStyle_ResolvedValue(swigCPtr);
}
swigCPtr = 0;
}
}
public ResolvedValue() {
this(OsmAndCoreJNI.new_ResolvedMapStyle_ResolvedValue(), true);
}
public void setIsDynamic(boolean value) {
OsmAndCoreJNI.ResolvedMapStyle_ResolvedValue_isDynamic_set(swigCPtr, this, value);
}
public boolean getIsDynamic() {
return OsmAndCoreJNI.ResolvedMapStyle_ResolvedValue_isDynamic_get(swigCPtr, this);
}
public void setAsConstantValue(MapStyleConstantValue value) {
OsmAndCoreJNI.ResolvedMapStyle_ResolvedValue_asConstantValue_set(swigCPtr, this, MapStyleConstantValue.getCPtr(value), value);
}
public MapStyleConstantValue getAsConstantValue() {
return new MapStyleConstantValue(OsmAndCoreJNI.ResolvedMapStyle_ResolvedValue_asConstantValue_get(swigCPtr, this), true);
}
public static ResolvedMapStyle.ResolvedValue fromConstantValue(MapStyleConstantValue input) {
return new ResolvedMapStyle.ResolvedValue(OsmAndCoreJNI.ResolvedMapStyle_ResolvedValue_fromConstantValue(MapStyleConstantValue.getCPtr(input), input), true);
}
public static ResolvedMapStyle.ResolvedValue fromAttribute(SWIGTYPE_p_std__shared_ptrT_OsmAnd__ResolvedMapStyle__Attribute_const_t attribute) {
return new ResolvedMapStyle.ResolvedValue(OsmAndCoreJNI.ResolvedMapStyle_ResolvedValue_fromAttribute(SWIGTYPE_p_std__shared_ptrT_OsmAnd__ResolvedMapStyle__Attribute_const_t.getCPtr(attribute)), true);
}
}
static public class RuleNode {
private long swigCPtr;
protected boolean swigCMemOwn;
protected RuleNode(long cPtr, boolean cMemoryOwn) {
swigCMemOwn = cMemoryOwn;
swigCPtr = cPtr;
}
protected static long getCPtr(RuleNode obj) {
return (obj == null) ? 0 : obj.swigCPtr;
}
protected void finalize() {
delete();
}
public synchronized void delete() {
if (swigCPtr != 0) {
if (swigCMemOwn) {
swigCMemOwn = false;
OsmAndCoreJNI.delete_ResolvedMapStyle_RuleNode(swigCPtr);
}
swigCPtr = 0;
}
}
public RuleNode(boolean applyOnlyIfOneOfConditionalsAccepted) {
this(OsmAndCoreJNI.new_ResolvedMapStyle_RuleNode(applyOnlyIfOneOfConditionalsAccepted), true);
}
public boolean getApplyOnlyIfOneOfConditionalsAccepted() {
return OsmAndCoreJNI.ResolvedMapStyle_RuleNode_applyOnlyIfOneOfConditionalsAccepted_get(swigCPtr, this);
}
public void setValues(SWIGTYPE_p_QHashT_int_OsmAnd__ResolvedMapStyle__ResolvedValue_t value) {
OsmAndCoreJNI.ResolvedMapStyle_RuleNode_values_set(swigCPtr, this, SWIGTYPE_p_QHashT_int_OsmAnd__ResolvedMapStyle__ResolvedValue_t.getCPtr(value));
}
public SWIGTYPE_p_QHashT_int_OsmAnd__ResolvedMapStyle__ResolvedValue_t getValues() {
long cPtr = OsmAndCoreJNI.ResolvedMapStyle_RuleNode_values_get(swigCPtr, this);
return (cPtr == 0) ? null : new SWIGTYPE_p_QHashT_int_OsmAnd__ResolvedMapStyle__ResolvedValue_t(cPtr, false);
}
public void setOneOfConditionalSubnodes(SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__ResolvedMapStyle__RuleNode_t_t value) {
OsmAndCoreJNI.ResolvedMapStyle_RuleNode_oneOfConditionalSubnodes_set(swigCPtr, this, SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__ResolvedMapStyle__RuleNode_t_t.getCPtr(value));
}
public SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__ResolvedMapStyle__RuleNode_t_t getOneOfConditionalSubnodes() {
long cPtr = OsmAndCoreJNI.ResolvedMapStyle_RuleNode_oneOfConditionalSubnodes_get(swigCPtr, this);
return (cPtr == 0) ? null : new SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__ResolvedMapStyle__RuleNode_t_t(cPtr, false);
}
public void setApplySubnodes(SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__ResolvedMapStyle__RuleNode_t_t value) {
OsmAndCoreJNI.ResolvedMapStyle_RuleNode_applySubnodes_set(swigCPtr, this, SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__ResolvedMapStyle__RuleNode_t_t.getCPtr(value));
}
public SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__ResolvedMapStyle__RuleNode_t_t getApplySubnodes() {
long cPtr = OsmAndCoreJNI.ResolvedMapStyle_RuleNode_applySubnodes_get(swigCPtr, this);
return (cPtr == 0) ? null : new SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__ResolvedMapStyle__RuleNode_t_t(cPtr, false);
}
}
static public class BaseRule {
private long swigCPtr;
protected boolean swigCMemOwn;
protected BaseRule(long cPtr, boolean cMemoryOwn) {
swigCMemOwn = cMemoryOwn;
swigCPtr = cPtr;
}
protected static long getCPtr(BaseRule obj) {
return (obj == null) ? 0 : obj.swigCPtr;
}
protected void finalize() {
delete();
}
public synchronized void delete() {
if (swigCPtr != 0) {
if (swigCMemOwn) {
swigCMemOwn = false;
OsmAndCoreJNI.delete_ResolvedMapStyle_BaseRule(swigCPtr);
}
swigCPtr = 0;
}
}
public SWIGTYPE_p_std__shared_ptrT_OsmAnd__ResolvedMapStyle__RuleNode_t getRootNode() {
long cPtr = OsmAndCoreJNI.ResolvedMapStyle_BaseRule_rootNode_get(swigCPtr, this);
return (cPtr == 0) ? null : new SWIGTYPE_p_std__shared_ptrT_OsmAnd__ResolvedMapStyle__RuleNode_t(cPtr, false);
}
}
static public class Rule extends ResolvedMapStyle.BaseRule {
private long swigCPtr;
protected Rule(long cPtr, boolean cMemoryOwn) {
super(OsmAndCoreJNI.ResolvedMapStyle_Rule_SWIGUpcast(cPtr), cMemoryOwn);
swigCPtr = cPtr;
}
protected static long getCPtr(Rule obj) {
return (obj == null) ? 0 : obj.swigCPtr;
}
protected void finalize() {
delete();
}
public synchronized void delete() {
if (swigCPtr != 0) {
if (swigCMemOwn) {
swigCMemOwn = false;
OsmAndCoreJNI.delete_ResolvedMapStyle_Rule(swigCPtr);
}
swigCPtr = 0;
}
super.delete();
}
public Rule(MapStyleRulesetType rulesetType) {
this(OsmAndCoreJNI.new_ResolvedMapStyle_Rule(rulesetType.swigValue()), true);
}
public MapStyleRulesetType getRulesetType() {
return MapStyleRulesetType.swigToEnum(OsmAndCoreJNI.ResolvedMapStyle_Rule_rulesetType_get(swigCPtr, this));
}
}
static public class Attribute extends ResolvedMapStyle.BaseRule {
private long swigCPtr;
protected Attribute(long cPtr, boolean cMemoryOwn) {
super(OsmAndCoreJNI.ResolvedMapStyle_Attribute_SWIGUpcast(cPtr), cMemoryOwn);
swigCPtr = cPtr;
}
protected static long getCPtr(Attribute obj) {
return (obj == null) ? 0 : obj.swigCPtr;
}
protected void finalize() {
delete();
}
public synchronized void delete() {
if (swigCPtr != 0) {
if (swigCMemOwn) {
swigCMemOwn = false;
OsmAndCoreJNI.delete_ResolvedMapStyle_Attribute(swigCPtr);
}
swigCPtr = 0;
}
super.delete();
}
public Attribute(long nameId) {
this(OsmAndCoreJNI.new_ResolvedMapStyle_Attribute(nameId), true);
}
public long getNameId() {
return OsmAndCoreJNI.ResolvedMapStyle_Attribute_nameId_get(swigCPtr, this);
}
}
static public class Parameter {
private long swigCPtr;
protected boolean swigCMemOwn;
protected Parameter(long cPtr, boolean cMemoryOwn) {
swigCMemOwn = cMemoryOwn;
swigCPtr = cPtr;
}
protected static long getCPtr(Parameter obj) {
return (obj == null) ? 0 : obj.swigCPtr;
}
protected void finalize() {
delete();
}
public synchronized void delete() {
if (swigCPtr != 0) {
if (swigCMemOwn) {
swigCMemOwn = false;
OsmAndCoreJNI.delete_ResolvedMapStyle_Parameter(swigCPtr);
}
swigCPtr = 0;
}
}
public Parameter(String title, String description, long nameId, MapStyleValueDataType dataType, SWIGTYPE_p_QListT_OsmAnd__MapStyleConstantValue_t possibleValues) {
this(OsmAndCoreJNI.new_ResolvedMapStyle_Parameter(title, description, nameId, dataType.swigValue(), SWIGTYPE_p_QListT_OsmAnd__MapStyleConstantValue_t.getCPtr(possibleValues)), true);
}
public void setTitle(String value) {
OsmAndCoreJNI.ResolvedMapStyle_Parameter_title_set(swigCPtr, this, value);
}
public String getTitle() {
return OsmAndCoreJNI.ResolvedMapStyle_Parameter_title_get(swigCPtr, this);
}
public void setDescription(String value) {
OsmAndCoreJNI.ResolvedMapStyle_Parameter_description_set(swigCPtr, this, value);
}
public String getDescription() {
return OsmAndCoreJNI.ResolvedMapStyle_Parameter_description_get(swigCPtr, this);
}
public void setNameId(long value) {
OsmAndCoreJNI.ResolvedMapStyle_Parameter_nameId_set(swigCPtr, this, value);
}
public long getNameId() {
return OsmAndCoreJNI.ResolvedMapStyle_Parameter_nameId_get(swigCPtr, this);
}
public void setDataType(MapStyleValueDataType value) {
OsmAndCoreJNI.ResolvedMapStyle_Parameter_dataType_set(swigCPtr, this, value.swigValue());
}
public MapStyleValueDataType getDataType() {
return MapStyleValueDataType.swigToEnum(OsmAndCoreJNI.ResolvedMapStyle_Parameter_dataType_get(swigCPtr, this));
}
public void setPossibleValues(SWIGTYPE_p_QListT_OsmAnd__MapStyleConstantValue_t value) {
OsmAndCoreJNI.ResolvedMapStyle_Parameter_possibleValues_set(swigCPtr, this, SWIGTYPE_p_QListT_OsmAnd__MapStyleConstantValue_t.getCPtr(value));
}
public SWIGTYPE_p_QListT_OsmAnd__MapStyleConstantValue_t getPossibleValues() {
long cPtr = OsmAndCoreJNI.ResolvedMapStyle_Parameter_possibleValues_get(swigCPtr, this);
return (cPtr == 0) ? null : new SWIGTYPE_p_QListT_OsmAnd__MapStyleConstantValue_t(cPtr, false);
}
}
static public class ParameterValueDefinition extends MapStyleValueDefinition {
private long swigCPtr;
private boolean swigCMemOwnDerived;
protected ParameterValueDefinition(long cPtr, boolean cMemoryOwn) {
super(OsmAndCoreJNI.ResolvedMapStyle_ParameterValueDefinition_SWIGSmartPtrUpcast(cPtr), true);
swigCMemOwnDerived = cMemoryOwn;
swigCPtr = cPtr;
}
protected static long getCPtr(ParameterValueDefinition obj) {
return (obj == null) ? 0 : obj.swigCPtr;
}
protected void finalize() {
delete();
}
public synchronized void delete() {
if (swigCPtr != 0) {
if (swigCMemOwnDerived) {
swigCMemOwnDerived = false;
OsmAndCoreJNI.delete_ResolvedMapStyle_ParameterValueDefinition(swigCPtr);
}
swigCPtr = 0;
}
super.delete();
}
public ParameterValueDefinition(int id, String name, SWIGTYPE_p_std__shared_ptrT_OsmAnd__ResolvedMapStyle__Parameter_const_t parameter) {
this(OsmAndCoreJNI.new_ResolvedMapStyle_ParameterValueDefinition(id, name, SWIGTYPE_p_std__shared_ptrT_OsmAnd__ResolvedMapStyle__Parameter_const_t.getCPtr(parameter)), true);
}
public int getId() {
return OsmAndCoreJNI.ResolvedMapStyle_ParameterValueDefinition_id_get(swigCPtr, this);
}
public SWIGTYPE_p_std__shared_ptrT_OsmAnd__ResolvedMapStyle__Parameter_const_t getParameter() {
long cPtr = OsmAndCoreJNI.ResolvedMapStyle_ParameterValueDefinition_parameter_get(swigCPtr, this);
return (cPtr == 0) ? null : new SWIGTYPE_p_std__shared_ptrT_OsmAnd__ResolvedMapStyle__Parameter_const_t(cPtr, false);
}
}
public SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__UnresolvedMapStyle_const_t_t getUnresolvedMapStylesChain() {
long cPtr = OsmAndCoreJNI.ResolvedMapStyle_unresolvedMapStylesChain_get(swigCPtr, this);
return (cPtr == 0) ? null : new SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__UnresolvedMapStyle_const_t_t(cPtr, false);
}
public int getValueDefinitionIdByName(String name) {
return OsmAndCoreJNI.ResolvedMapStyle_getValueDefinitionIdByName(swigCPtr, this, name);
}
public MapStyleValueDefinition getValueDefinitionById(int id) {
long cPtr = OsmAndCoreJNI.ResolvedMapStyle_getValueDefinitionById(swigCPtr, this, id);
return (cPtr == 0) ? null : new MapStyleValueDefinition(cPtr, true);
}
public boolean parseValue(String input, int valueDefintionId, MapStyleConstantValue outParsedValue) {
return OsmAndCoreJNI.ResolvedMapStyle_parseValue__SWIG_0(swigCPtr, this, input, valueDefintionId, MapStyleConstantValue.getCPtr(outParsedValue), outParsedValue);
}
public boolean parseValue(String input, MapStyleValueDefinition valueDefintion, MapStyleConstantValue outParsedValue) {
return OsmAndCoreJNI.ResolvedMapStyle_parseValue__SWIG_1(swigCPtr, this, input, MapStyleValueDefinition.getCPtr(valueDefintion), valueDefintion, MapStyleConstantValue.getCPtr(outParsedValue), outParsedValue);
}
public SWIGTYPE_p_std__shared_ptrT_OsmAnd__ResolvedMapStyle__Attribute_const_t getAttribute(String name) {
return new SWIGTYPE_p_std__shared_ptrT_OsmAnd__ResolvedMapStyle__Attribute_const_t(OsmAndCoreJNI.ResolvedMapStyle_getAttribute(swigCPtr, this, name), true);
}
public SWIGTYPE_p_QHashT_OsmAnd__TagValueId_std__shared_ptrT_OsmAnd__ResolvedMapStyle__Rule_const_t_t getRuleset(MapStyleRulesetType rulesetType) {
return new SWIGTYPE_p_QHashT_OsmAnd__TagValueId_std__shared_ptrT_OsmAnd__ResolvedMapStyle__Rule_const_t_t(OsmAndCoreJNI.ResolvedMapStyle_getRuleset(swigCPtr, this, rulesetType.swigValue()), true);
}
public String getStringById(long id) {
return OsmAndCoreJNI.ResolvedMapStyle_getStringById(swigCPtr, this, id);
}
public String dump(String prefix) {
return OsmAndCoreJNI.ResolvedMapStyle_dump__SWIG_0(swigCPtr, this, prefix);
}
public String dump() {
return OsmAndCoreJNI.ResolvedMapStyle_dump__SWIG_1(swigCPtr, this);
}
public static ResolvedMapStyle resolveMapStylesChain(SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__UnresolvedMapStyle_const_t_t unresolvedMapStylesChain) {
long cPtr = OsmAndCoreJNI.ResolvedMapStyle_resolveMapStylesChain(SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__UnresolvedMapStyle_const_t_t.getCPtr(unresolvedMapStylesChain));
return (cPtr == 0) ? null : new ResolvedMapStyle(cPtr, true);
}
public final static int EmptyStringId = OsmAndCoreJNI.ResolvedMapStyle_EmptyStringId_get();
}

8
OsmAnd/src/net/osmand/core/jni/ResourcesManager.java
View file

@ -370,13 +370,13 @@ public class ResourcesManager {
super.delete();
}
public MapStyleMetadata(MapStyle mapStyle) {
this(OsmAndCoreJNI.new_ResourcesManager_MapStyleMetadata(MapStyle.getCPtr(mapStyle), mapStyle), true);
public MapStyleMetadata(SWIGTYPE_p_std__shared_ptrT_OsmAnd__UnresolvedMapStyle_t mapStyle) {
this(OsmAndCoreJNI.new_ResourcesManager_MapStyleMetadata(SWIGTYPE_p_std__shared_ptrT_OsmAnd__UnresolvedMapStyle_t.getCPtr(mapStyle)), true);
}
public MapStyle getMapStyle() {
public SWIGTYPE_p_std__shared_ptrT_OsmAnd__UnresolvedMapStyle_t getMapStyle() {
long cPtr = OsmAndCoreJNI.ResourcesManager_MapStyleMetadata_mapStyle_get(swigCPtr, this);
return (cPtr == 0) ? null : new MapStyle(cPtr, true);
return (cPtr == 0) ? null : new SWIGTYPE_p_std__shared_ptrT_OsmAnd__UnresolvedMapStyle_t(cPtr, false);
}
}

8
OsmAnd/src/net/osmand/core/jni/SWIGTYPE_p_QHashT_std__shared_ptrT_OsmAnd__MapStyleValueDefinition_const_t_OsmAnd__MapStyleValue_t.java → OsmAnd/src/net/osmand/core/jni/SWIGTYPE_p_QHashT_OsmAnd__TagValueId_std__shared_ptrT_OsmAnd__ResolvedMapStyle__Rule_const_t_t.java
View file

@ -8,18 +8,18 @@
package net.osmand.core.jni;
public class SWIGTYPE_p_QHashT_std__shared_ptrT_OsmAnd__MapStyleValueDefinition_const_t_OsmAnd__MapStyleValue_t {
public class SWIGTYPE_p_QHashT_OsmAnd__TagValueId_std__shared_ptrT_OsmAnd__ResolvedMapStyle__Rule_const_t_t {
private long swigCPtr;
protected SWIGTYPE_p_QHashT_std__shared_ptrT_OsmAnd__MapStyleValueDefinition_const_t_OsmAnd__MapStyleValue_t(long cPtr, boolean futureUse) {
protected SWIGTYPE_p_QHashT_OsmAnd__TagValueId_std__shared_ptrT_OsmAnd__ResolvedMapStyle__Rule_const_t_t(long cPtr, boolean futureUse) {
swigCPtr = cPtr;
}
protected SWIGTYPE_p_QHashT_std__shared_ptrT_OsmAnd__MapStyleValueDefinition_const_t_OsmAnd__MapStyleValue_t() {
protected SWIGTYPE_p_QHashT_OsmAnd__TagValueId_std__shared_ptrT_OsmAnd__ResolvedMapStyle__Rule_const_t_t() {
swigCPtr = 0;
}
protected static long getCPtr(SWIGTYPE_p_QHashT_std__shared_ptrT_OsmAnd__MapStyleValueDefinition_const_t_OsmAnd__MapStyleValue_t obj) {
protected static long getCPtr(SWIGTYPE_p_QHashT_OsmAnd__TagValueId_std__shared_ptrT_OsmAnd__ResolvedMapStyle__Rule_const_t_t obj) {
return (obj == null) ? 0 : obj.swigCPtr;
}
}

26
OsmAnd/src/net/osmand/core/jni/SWIGTYPE_p_QHashT_int_OsmAnd__MapStyleConstantValue_t.java Normal file
View file

@ -0,0 +1,26 @@
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
* Version 3.0.3
*
* Do not make changes to this file unless you know what you are doing--modify
* the SWIG interface file instead.
* ----------------------------------------------------------------------------- */
package net.osmand.core.jni;
public class SWIGTYPE_p_QHashT_int_OsmAnd__MapStyleConstantValue_t {
private long swigCPtr;
protected SWIGTYPE_p_QHashT_int_OsmAnd__MapStyleConstantValue_t(long cPtr, boolean futureUse) {
swigCPtr = cPtr;
}
protected SWIGTYPE_p_QHashT_int_OsmAnd__MapStyleConstantValue_t() {
swigCPtr = 0;
}
protected static long getCPtr(SWIGTYPE_p_QHashT_int_OsmAnd__MapStyleConstantValue_t obj) {
return (obj == null) ? 0 : obj.swigCPtr;
}
}

26
OsmAnd/src/net/osmand/core/jni/SWIGTYPE_p_QHashT_int_OsmAnd__ResolvedMapStyle__ResolvedValue_t.java Normal file
View file

@ -0,0 +1,26 @@
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
* Version 3.0.3
*
* Do not make changes to this file unless you know what you are doing--modify
* the SWIG interface file instead.
* ----------------------------------------------------------------------------- */
package net.osmand.core.jni;
public class SWIGTYPE_p_QHashT_int_OsmAnd__ResolvedMapStyle__ResolvedValue_t {
private long swigCPtr;
protected SWIGTYPE_p_QHashT_int_OsmAnd__ResolvedMapStyle__ResolvedValue_t(long cPtr, boolean futureUse) {
swigCPtr = cPtr;
}
protected SWIGTYPE_p_QHashT_int_OsmAnd__ResolvedMapStyle__ResolvedValue_t() {
swigCPtr = 0;
}
protected static long getCPtr(SWIGTYPE_p_QHashT_int_OsmAnd__ResolvedMapStyle__ResolvedValue_t obj) {
return (obj == null) ? 0 : obj.swigCPtr;
}
}

26
OsmAnd/src/net/osmand/core/jni/SWIGTYPE_p_QListT_OsmAnd__MapStyleConstantValue_t.java Normal file
View file

@ -0,0 +1,26 @@
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
* Version 3.0.3
*
* Do not make changes to this file unless you know what you are doing--modify
* the SWIG interface file instead.
* ----------------------------------------------------------------------------- */
package net.osmand.core.jni;
public class SWIGTYPE_p_QListT_OsmAnd__MapStyleConstantValue_t {
private long swigCPtr;
protected SWIGTYPE_p_QListT_OsmAnd__MapStyleConstantValue_t(long cPtr, boolean futureUse) {
swigCPtr = cPtr;
}
protected SWIGTYPE_p_QListT_OsmAnd__MapStyleConstantValue_t() {
swigCPtr = 0;
}
protected static long getCPtr(SWIGTYPE_p_QListT_OsmAnd__MapStyleConstantValue_t obj) {
return (obj == null) ? 0 : obj.swigCPtr;
}
}

26
OsmAnd/src/net/osmand/core/jni/SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__ResolvedMapStyle__RuleNode_t_t.java Normal file
View file

@ -0,0 +1,26 @@
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
* Version 3.0.3
*
* Do not make changes to this file unless you know what you are doing--modify
* the SWIG interface file instead.
* ----------------------------------------------------------------------------- */
package net.osmand.core.jni;
public class SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__ResolvedMapStyle__RuleNode_t_t {
private long swigCPtr;
protected SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__ResolvedMapStyle__RuleNode_t_t(long cPtr, boolean futureUse) {
swigCPtr = cPtr;
}
protected SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__ResolvedMapStyle__RuleNode_t_t() {
swigCPtr = 0;
}
protected static long getCPtr(SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__ResolvedMapStyle__RuleNode_t_t obj) {
return (obj == null) ? 0 : obj.swigCPtr;
}
}

8
OsmAnd/src/net/osmand/core/jni/SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__MapStyle_const_t_t.java → OsmAnd/src/net/osmand/core/jni/SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__UnresolvedMapStyle_const_t_t.java
View file

@ -8,18 +8,18 @@
package net.osmand.core.jni;
public class SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__MapStyle_const_t_t {
public class SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__UnresolvedMapStyle_const_t_t {
private long swigCPtr;
protected SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__MapStyle_const_t_t(long cPtr, boolean futureUse) {
protected SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__UnresolvedMapStyle_const_t_t(long cPtr, boolean futureUse) {
swigCPtr = cPtr;
}
protected SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__MapStyle_const_t_t() {
protected SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__UnresolvedMapStyle_const_t_t() {
swigCPtr = 0;
}
protected static long getCPtr(SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__MapStyle_const_t_t obj) {
protected static long getCPtr(SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__UnresolvedMapStyle_const_t_t obj) {
return (obj == null) ? 0 : obj.swigCPtr;
}
}

26
OsmAnd/src/net/osmand/core/jni/SWIGTYPE_p_std__shared_ptrT_OsmAnd__ResolvedMapStyle__Attribute_const_t.java Normal file
View file

@ -0,0 +1,26 @@
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
* Version 3.0.3
*
* Do not make changes to this file unless you know what you are doing--modify
* the SWIG interface file instead.
* ----------------------------------------------------------------------------- */
package net.osmand.core.jni;
public class SWIGTYPE_p_std__shared_ptrT_OsmAnd__ResolvedMapStyle__Attribute_const_t {
private long swigCPtr;
protected SWIGTYPE_p_std__shared_ptrT_OsmAnd__ResolvedMapStyle__Attribute_const_t(long cPtr, boolean futureUse) {
swigCPtr = cPtr;
}
protected SWIGTYPE_p_std__shared_ptrT_OsmAnd__ResolvedMapStyle__Attribute_const_t() {
swigCPtr = 0;
}
protected static long getCPtr(SWIGTYPE_p_std__shared_ptrT_OsmAnd__ResolvedMapStyle__Attribute_const_t obj) {
return (obj == null) ? 0 : obj.swigCPtr;
}
}

26
OsmAnd/src/net/osmand/core/jni/SWIGTYPE_p_std__shared_ptrT_OsmAnd__ResolvedMapStyle__Parameter_const_t.java Normal file
View file

@ -0,0 +1,26 @@
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
* Version 3.0.3
*
* Do not make changes to this file unless you know what you are doing--modify
* the SWIG interface file instead.
* ----------------------------------------------------------------------------- */
package net.osmand.core.jni;
public class SWIGTYPE_p_std__shared_ptrT_OsmAnd__ResolvedMapStyle__Parameter_const_t {
private long swigCPtr;
protected SWIGTYPE_p_std__shared_ptrT_OsmAnd__ResolvedMapStyle__Parameter_const_t(long cPtr, boolean futureUse) {
swigCPtr = cPtr;
}
protected SWIGTYPE_p_std__shared_ptrT_OsmAnd__ResolvedMapStyle__Parameter_const_t() {
swigCPtr = 0;
}
protected static long getCPtr(SWIGTYPE_p_std__shared_ptrT_OsmAnd__ResolvedMapStyle__Parameter_const_t obj) {
return (obj == null) ? 0 : obj.swigCPtr;
}
}

26
OsmAnd/src/net/osmand/core/jni/SWIGTYPE_p_std__shared_ptrT_OsmAnd__ResolvedMapStyle__RuleNode_t.java Normal file
View file

@ -0,0 +1,26 @@
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
* Version 3.0.3
*
* Do not make changes to this file unless you know what you are doing--modify
* the SWIG interface file instead.
* ----------------------------------------------------------------------------- */
package net.osmand.core.jni;
public class SWIGTYPE_p_std__shared_ptrT_OsmAnd__ResolvedMapStyle__RuleNode_t {
private long swigCPtr;
protected SWIGTYPE_p_std__shared_ptrT_OsmAnd__ResolvedMapStyle__RuleNode_t(long cPtr, boolean futureUse) {
swigCPtr = cPtr;
}
protected SWIGTYPE_p_std__shared_ptrT_OsmAnd__ResolvedMapStyle__RuleNode_t() {
swigCPtr = 0;
}
protected static long getCPtr(SWIGTYPE_p_std__shared_ptrT_OsmAnd__ResolvedMapStyle__RuleNode_t obj) {
return (obj == null) ? 0 : obj.swigCPtr;
}
}

26
OsmAnd/src/net/osmand/core/jni/SWIGTYPE_p_std__shared_ptrT_OsmAnd__UnresolvedMapStyle_const_t.java Normal file
View file

@ -0,0 +1,26 @@
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
* Version 3.0.3
*
* Do not make changes to this file unless you know what you are doing--modify
* the SWIG interface file instead.
* ----------------------------------------------------------------------------- */
package net.osmand.core.jni;
public class SWIGTYPE_p_std__shared_ptrT_OsmAnd__UnresolvedMapStyle_const_t {
private long swigCPtr;
protected SWIGTYPE_p_std__shared_ptrT_OsmAnd__UnresolvedMapStyle_const_t(long cPtr, boolean futureUse) {
swigCPtr = cPtr;
}
protected SWIGTYPE_p_std__shared_ptrT_OsmAnd__UnresolvedMapStyle_const_t() {
swigCPtr = 0;
}
protected static long getCPtr(SWIGTYPE_p_std__shared_ptrT_OsmAnd__UnresolvedMapStyle_const_t obj) {
return (obj == null) ? 0 : obj.swigCPtr;
}
}

26
OsmAnd/src/net/osmand/core/jni/SWIGTYPE_p_std__shared_ptrT_OsmAnd__UnresolvedMapStyle_t.java Normal file
View file

@ -0,0 +1,26 @@
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
* Version 3.0.3
*
* Do not make changes to this file unless you know what you are doing--modify
* the SWIG interface file instead.
* ----------------------------------------------------------------------------- */
package net.osmand.core.jni;
public class SWIGTYPE_p_std__shared_ptrT_OsmAnd__UnresolvedMapStyle_t {
private long swigCPtr;
protected SWIGTYPE_p_std__shared_ptrT_OsmAnd__UnresolvedMapStyle_t(long cPtr, boolean futureUse) {
swigCPtr = cPtr;
}
protected SWIGTYPE_p_std__shared_ptrT_OsmAnd__UnresolvedMapStyle_t() {
swigCPtr = 0;
}
protected static long getCPtr(SWIGTYPE_p_std__shared_ptrT_OsmAnd__UnresolvedMapStyle_t obj) {
return (obj == null) ? 0 : obj.swigCPtr;
}
}

26
OsmAnd/src/net/osmand/core/jni/SWIGTYPE_p_unsigned_char.java Normal file
View file

@ -0,0 +1,26 @@
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
* Version 3.0.3
*
* Do not make changes to this file unless you know what you are doing--modify
* the SWIG interface file instead.
* ----------------------------------------------------------------------------- */
package net.osmand.core.jni;
public class SWIGTYPE_p_unsigned_char {
private long swigCPtr;
protected SWIGTYPE_p_unsigned_char(long cPtr, boolean futureUse) {
swigCPtr = cPtr;
}
protected SWIGTYPE_p_unsigned_char() {
swigCPtr = 0;
}
protected static long getCPtr(SWIGTYPE_p_unsigned_char obj) {
return (obj == null) ? 0 : obj.swigCPtr;
}
}

8
OsmAnd/src/net/osmand/core/jni/SwigUtilities.java
View file

@ -43,4 +43,12 @@ public class SwigUtilities {
return new SWIGTYPE_p_QByteArray(OsmAndCoreJNI.SwigUtilities_emptyQByteArray(), true);
}
public static SWIGTYPE_p_QByteArray qDecompress(SWIGTYPE_p_QByteArray compressedData) {
return new SWIGTYPE_p_QByteArray(OsmAndCoreJNI.SwigUtilities_qDecompress(SWIGTYPE_p_QByteArray.getCPtr(compressedData)), true);
}
public static SWIGTYPE_p_std__shared_ptrT_SkBitmap_const_t createSkBitmapARGB888With(long width, long height, SWIGTYPE_p_unsigned_char pBuffer, long bufferSize) {
return new SWIGTYPE_p_std__shared_ptrT_SkBitmap_const_t(OsmAndCoreJNI.SwigUtilities_createSkBitmapARGB888With(width, height, SWIGTYPE_p_unsigned_char.getCPtr(pBuffer), bufferSize), true);
}
}

70
OsmAnd/src/net/osmand/core/jni/TagValueId.java Normal file
View file

@ -0,0 +1,70 @@
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
* Version 3.0.3
*
* Do not make changes to this file unless you know what you are doing--modify
* the SWIG interface file instead.
* ----------------------------------------------------------------------------- */
package net.osmand.core.jni;
public class TagValueId {
private long swigCPtr;
protected boolean swigCMemOwn;
protected TagValueId(long cPtr, boolean cMemoryOwn) {
swigCMemOwn = cMemoryOwn;
swigCPtr = cPtr;
}
protected static long getCPtr(TagValueId obj) {
return (obj == null) ? 0 : obj.swigCPtr;
}
protected void finalize() {
delete();
}
public synchronized void delete() {
if (swigCPtr != 0) {
if (swigCMemOwn) {
swigCMemOwn = false;
OsmAndCoreJNI.delete_TagValueId(swigCPtr);
}
swigCPtr = 0;
}
}
public void setId(java.math.BigInteger value) {
OsmAndCoreJNI.TagValueId_id_set(swigCPtr, this, value);
}
public java.math.BigInteger getId() {
return OsmAndCoreJNI.TagValueId_id_get(swigCPtr, this);
}
public void setTagId(int value) {
OsmAndCoreJNI.TagValueId_tagId_set(swigCPtr, this, value);
}
public int getTagId() {
return OsmAndCoreJNI.TagValueId_tagId_get(swigCPtr, this);
}
public void setValueId(int value) {
OsmAndCoreJNI.TagValueId_valueId_set(swigCPtr, this, value);
}
public int getValueId() {
return OsmAndCoreJNI.TagValueId_valueId_get(swigCPtr, this);
}
public static TagValueId compose(int tagId, int valueId) {
return new TagValueId(OsmAndCoreJNI.TagValueId_compose(tagId, valueId), true);
}
public TagValueId() {
this(OsmAndCoreJNI.new_TagValueId(), true);
}
}

11
OsmAnd/src/net/osmand/core/jni/Utilities.java
View file

@ -195,10 +195,6 @@ public class Utilities {
return new PointI(OsmAndCoreJNI.Utilities_normalizeCoordinates(PointI.getCPtr(input), input, zoom.swigValue()), true);
}
public static short computeCohenSutherlandCode(PointI p, AreaI box) {
return OsmAndCoreJNI.Utilities_computeCohenSutherlandCode(PointI.getCPtr(p), p, AreaI.getCPtr(box), box);
}
public static boolean extractFirstNumberPosition(String value, SWIGTYPE_p_int first, SWIGTYPE_p_int last, boolean allowSigned, boolean allowDot) {
return OsmAndCoreJNI.Utilities_extractFirstNumberPosition(value, SWIGTYPE_p_int.getCPtr(first), SWIGTYPE_p_int.getCPtr(last), allowSigned, allowDot);
}
@ -316,11 +312,10 @@ public class Utilities {
}
public enum CHCode {
Inside(OsmAndCoreJNI.Utilities_CHCode_Inside_get()),
Left(OsmAndCoreJNI.Utilities_CHCode_Left_get()),
Right(OsmAndCoreJNI.Utilities_CHCode_Right_get()),
Bottom(OsmAndCoreJNI.Utilities_CHCode_Bottom_get()),
Top(OsmAndCoreJNI.Utilities_CHCode_Top_get());
Right,
Bottom,
Top;
public final int swigValue() {
return swigValue;