Merge pull request #896 from Bars107/qtcore

Qtcore

JNI/src/net/osmand/core/jni/AlphaChannelData.java

@@ -0,0 +1,53 @@
+/* ----------------------------------------------------------------------------
+ * 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 AlphaChannelData {
+  Present,
+  NotPresent,
+  Undefined;
+
+  public final int swigValue() {
+    return swigValue;
+  }
+
+  public static AlphaChannelData swigToEnum(int swigValue) {
+    AlphaChannelData[] swigValues = AlphaChannelData.class.getEnumConstants();
+    if (swigValue < swigValues.length && swigValue >= 0 && swigValues[swigValue].swigValue == swigValue)
+      return swigValues[swigValue];
+    for (AlphaChannelData swigEnum : swigValues)
+      if (swigEnum.swigValue == swigValue)
+        return swigEnum;
+    throw new IllegalArgumentException("No enum " + AlphaChannelData.class + " with value " + swigValue);
+  }
+
+  @SuppressWarnings("unused")
+  private AlphaChannelData() {
+    this.swigValue = SwigNext.next++;
+  }
+
+  @SuppressWarnings("unused")
+  private AlphaChannelData(int swigValue) {
+    this.swigValue = swigValue;
+    SwigNext.next = swigValue+1;
+  }
+
+  @SuppressWarnings("unused")
+  private AlphaChannelData(AlphaChannelData swigEnum) {
+    this.swigValue = swigEnum.swigValue;
+    SwigNext.next = this.swigValue+1;
+  }
+
+  private final int swigValue;
+
+  private static class SwigNext {
+    private static int next = 0;
+  }
+}
+

JNI/src/net/osmand/core/jni/AreaD.java

@@ -0,0 +1,148 @@
+/* ----------------------------------------------------------------------------
+ * 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 AreaD {
+  private long swigCPtr;
+  protected boolean swigCMemOwn;
+
+  protected AreaD(long cPtr, boolean cMemoryOwn) {
+    swigCMemOwn = cMemoryOwn;
+    swigCPtr = cPtr;
+  }
+
+  protected static long getCPtr(AreaD obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+
+  protected void finalize() {
+    delete();
+  }
+
+  public synchronized void delete() {
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        OsmAndCoreJNI.delete_AreaD(swigCPtr);
+      }
+      swigCPtr = 0;
+    }
+  }
+
+  public AreaD() {
+    this(OsmAndCoreJNI.new_AreaD__SWIG_0(), true);
+  }
+
+  public AreaD(double t, double l, double b, double r) {
+    this(OsmAndCoreJNI.new_AreaD__SWIG_1(t, l, b, r), true);
+  }
+
+  public AreaD(PointD tl, PointD br) {
+    this(OsmAndCoreJNI.new_AreaD__SWIG_2(PointD.getCPtr(tl), tl, PointD.getCPtr(br), br), true);
+  }
+
+  public AreaD(AreaD that) {
+    this(OsmAndCoreJNI.new_AreaD__SWIG_3(AreaD.getCPtr(that), that), true);
+  }
+
+  public void setTopLeft(PointD value) {
+    OsmAndCoreJNI.AreaD_topLeft_set(swigCPtr, this, PointD.getCPtr(value), value);
+  }
+
+  public PointD getTopLeft() {
+    long cPtr = OsmAndCoreJNI.AreaD_topLeft_get(swigCPtr, this);
+    return (cPtr == 0) ? null : new PointD(cPtr, false);
+  }
+
+  public void setBottomRight(PointD value) {
+    OsmAndCoreJNI.AreaD_bottomRight_set(swigCPtr, this, PointD.getCPtr(value), value);
+  }
+
+  public PointD getBottomRight() {
+    long cPtr = OsmAndCoreJNI.AreaD_bottomRight_get(swigCPtr, this);
+    return (cPtr == 0) ? null : new PointD(cPtr, false);
+  }
+
+  public boolean contains(double x, double y) {
+    return OsmAndCoreJNI.AreaD_contains__SWIG_0(swigCPtr, this, x, y);
+  }
+
+  public boolean contains(PointD p) {
+    return OsmAndCoreJNI.AreaD_contains__SWIG_1(swigCPtr, this, PointD.getCPtr(p), p);
+  }
+
+  public boolean contains(double t, double l, double b, double r) {
+    return OsmAndCoreJNI.AreaD_contains__SWIG_2(swigCPtr, this, t, l, b, r);
+  }
+
+  public boolean contains(AreaD that) {
+    return OsmAndCoreJNI.AreaD_contains__SWIG_3(swigCPtr, this, AreaD.getCPtr(that), that);
+  }
+
+  public boolean intersects(double t, double l, double b, double r) {
+    return OsmAndCoreJNI.AreaD_intersects__SWIG_0(swigCPtr, this, t, l, b, r);
+  }
+
+  public boolean intersects(AreaD that) {
+    return OsmAndCoreJNI.AreaD_intersects__SWIG_1(swigCPtr, this, AreaD.getCPtr(that), that);
+  }
+
+  public boolean contains(OOBBD that) {
+    return OsmAndCoreJNI.AreaD_contains__SWIG_4(swigCPtr, this, OOBBD.getCPtr(that), that);
+  }
+
+  public boolean intersects(OOBBD that) {
+    return OsmAndCoreJNI.AreaD_intersects__SWIG_2(swigCPtr, this, OOBBD.getCPtr(that), that);
+  }
+
+  public double width() {
+    return OsmAndCoreJNI.AreaD_width(swigCPtr, this);
+  }
+
+  public double height() {
+    return OsmAndCoreJNI.AreaD_height(swigCPtr, this);
+  }
+
+  public PointD center() {
+    return new PointD(OsmAndCoreJNI.AreaD_center(swigCPtr, this), true);
+  }
+
+  public PointD topRight() {
+    return new PointD(OsmAndCoreJNI.AreaD_topRight(swigCPtr, this), true);
+  }
+
+  public PointD bottomLeft() {
+    return new PointD(OsmAndCoreJNI.AreaD_bottomLeft(swigCPtr, this), true);
+  }
+
+  public AreaD getQuadrant(Quadrant quadrant) {
+    return new AreaD(OsmAndCoreJNI.AreaD_getQuadrant(swigCPtr, this, quadrant.swigValue()), true);
+  }
+
+  public AreaD getEnlargedToInclude(PointD p) {
+    return new AreaD(OsmAndCoreJNI.AreaD_getEnlargedToInclude(swigCPtr, this, PointD.getCPtr(p), p), true);
+  }
+
+  public AreaD getEnlargedBy(PointD delta) {
+    return new AreaD(OsmAndCoreJNI.AreaD_getEnlargedBy__SWIG_0(swigCPtr, this, PointD.getCPtr(delta), delta), true);
+  }
+
+  public AreaD getEnlargedBy(double dt, double dl, double db, double dr) {
+    return new AreaD(OsmAndCoreJNI.AreaD_getEnlargedBy__SWIG_1(swigCPtr, this, dt, dl, db, dr), true);
+  }
+
+  public static AreaD largest() {
+    return new AreaD(OsmAndCoreJNI.AreaD_largest(), true);
+  }
+
+  public static AreaD fromCenterAndSize(double cx, double cy, double width, double height) {
+    return new AreaD(OsmAndCoreJNI.AreaD_fromCenterAndSize(cx, cy, width, height), true);
+  }
+
+}

JNI/src/net/osmand/core/jni/AreaF.java

@@ -0,0 +1,148 @@
+/* ----------------------------------------------------------------------------
+ * 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 AreaF {
+  private long swigCPtr;
+  protected boolean swigCMemOwn;
+
+  protected AreaF(long cPtr, boolean cMemoryOwn) {
+    swigCMemOwn = cMemoryOwn;
+    swigCPtr = cPtr;
+  }
+
+  protected static long getCPtr(AreaF obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+
+  protected void finalize() {
+    delete();
+  }
+
+  public synchronized void delete() {
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        OsmAndCoreJNI.delete_AreaF(swigCPtr);
+      }
+      swigCPtr = 0;
+    }
+  }
+
+  public AreaF() {
+    this(OsmAndCoreJNI.new_AreaF__SWIG_0(), true);
+  }
+
+  public AreaF(float t, float l, float b, float r) {
+    this(OsmAndCoreJNI.new_AreaF__SWIG_1(t, l, b, r), true);
+  }
+
+  public AreaF(PointF tl, PointF br) {
+    this(OsmAndCoreJNI.new_AreaF__SWIG_2(PointF.getCPtr(tl), tl, PointF.getCPtr(br), br), true);
+  }
+
+  public AreaF(AreaF that) {
+    this(OsmAndCoreJNI.new_AreaF__SWIG_3(AreaF.getCPtr(that), that), true);
+  }
+
+  public void setTopLeft(PointF value) {
+    OsmAndCoreJNI.AreaF_topLeft_set(swigCPtr, this, PointF.getCPtr(value), value);
+  }
+
+  public PointF getTopLeft() {
+    long cPtr = OsmAndCoreJNI.AreaF_topLeft_get(swigCPtr, this);
+    return (cPtr == 0) ? null : new PointF(cPtr, false);
+  }
+
+  public void setBottomRight(PointF value) {
+    OsmAndCoreJNI.AreaF_bottomRight_set(swigCPtr, this, PointF.getCPtr(value), value);
+  }
+
+  public PointF getBottomRight() {
+    long cPtr = OsmAndCoreJNI.AreaF_bottomRight_get(swigCPtr, this);
+    return (cPtr == 0) ? null : new PointF(cPtr, false);
+  }
+
+  public boolean contains(float x, float y) {
+    return OsmAndCoreJNI.AreaF_contains__SWIG_0(swigCPtr, this, x, y);
+  }
+
+  public boolean contains(PointF p) {
+    return OsmAndCoreJNI.AreaF_contains__SWIG_1(swigCPtr, this, PointF.getCPtr(p), p);
+  }
+
+  public boolean contains(float t, float l, float b, float r) {
+    return OsmAndCoreJNI.AreaF_contains__SWIG_2(swigCPtr, this, t, l, b, r);
+  }
+
+  public boolean contains(AreaF that) {
+    return OsmAndCoreJNI.AreaF_contains__SWIG_3(swigCPtr, this, AreaF.getCPtr(that), that);
+  }
+
+  public boolean intersects(float t, float l, float b, float r) {
+    return OsmAndCoreJNI.AreaF_intersects__SWIG_0(swigCPtr, this, t, l, b, r);
+  }
+
+  public boolean intersects(AreaF that) {
+    return OsmAndCoreJNI.AreaF_intersects__SWIG_1(swigCPtr, this, AreaF.getCPtr(that), that);
+  }
+
+  public boolean contains(OOBBF that) {
+    return OsmAndCoreJNI.AreaF_contains__SWIG_4(swigCPtr, this, OOBBF.getCPtr(that), that);
+  }
+
+  public boolean intersects(OOBBF that) {
+    return OsmAndCoreJNI.AreaF_intersects__SWIG_2(swigCPtr, this, OOBBF.getCPtr(that), that);
+  }
+
+  public float width() {
+    return OsmAndCoreJNI.AreaF_width(swigCPtr, this);
+  }
+
+  public float height() {
+    return OsmAndCoreJNI.AreaF_height(swigCPtr, this);
+  }
+
+  public PointF center() {
+    return new PointF(OsmAndCoreJNI.AreaF_center(swigCPtr, this), true);
+  }
+
+  public PointF topRight() {
+    return new PointF(OsmAndCoreJNI.AreaF_topRight(swigCPtr, this), true);
+  }
+
+  public PointF bottomLeft() {
+    return new PointF(OsmAndCoreJNI.AreaF_bottomLeft(swigCPtr, this), true);
+  }
+
+  public AreaF getQuadrant(Quadrant quadrant) {
+    return new AreaF(OsmAndCoreJNI.AreaF_getQuadrant(swigCPtr, this, quadrant.swigValue()), true);
+  }
+
+  public AreaF getEnlargedToInclude(PointF p) {
+    return new AreaF(OsmAndCoreJNI.AreaF_getEnlargedToInclude(swigCPtr, this, PointF.getCPtr(p), p), true);
+  }
+
+  public AreaF getEnlargedBy(PointF delta) {
+    return new AreaF(OsmAndCoreJNI.AreaF_getEnlargedBy__SWIG_0(swigCPtr, this, PointF.getCPtr(delta), delta), true);
+  }
+
+  public AreaF getEnlargedBy(float dt, float dl, float db, float dr) {
+    return new AreaF(OsmAndCoreJNI.AreaF_getEnlargedBy__SWIG_1(swigCPtr, this, dt, dl, db, dr), true);
+  }
+
+  public static AreaF largest() {
+    return new AreaF(OsmAndCoreJNI.AreaF_largest(), true);
+  }
+
+  public static AreaF fromCenterAndSize(float cx, float cy, float width, float height) {
+    return new AreaF(OsmAndCoreJNI.AreaF_fromCenterAndSize(cx, cy, width, height), true);
+  }
+
+}

JNI/src/net/osmand/core/jni/AreaI.java

@@ -0,0 +1,148 @@
+/* ----------------------------------------------------------------------------
+ * 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 AreaI {
+  private long swigCPtr;
+  protected boolean swigCMemOwn;
+
+  protected AreaI(long cPtr, boolean cMemoryOwn) {
+    swigCMemOwn = cMemoryOwn;
+    swigCPtr = cPtr;
+  }
+
+  protected static long getCPtr(AreaI obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+
+  protected void finalize() {
+    delete();
+  }
+
+  public synchronized void delete() {
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        OsmAndCoreJNI.delete_AreaI(swigCPtr);
+      }
+      swigCPtr = 0;
+    }
+  }
+
+  public AreaI() {
+    this(OsmAndCoreJNI.new_AreaI__SWIG_0(), true);
+  }
+
+  public AreaI(int t, int l, int b, int r) {
+    this(OsmAndCoreJNI.new_AreaI__SWIG_1(t, l, b, r), true);
+  }
+
+  public AreaI(PointI tl, PointI br) {
+    this(OsmAndCoreJNI.new_AreaI__SWIG_2(PointI.getCPtr(tl), tl, PointI.getCPtr(br), br), true);
+  }
+
+  public AreaI(AreaI that) {
+    this(OsmAndCoreJNI.new_AreaI__SWIG_3(AreaI.getCPtr(that), that), true);
+  }
+
+  public void setTopLeft(PointI value) {
+    OsmAndCoreJNI.AreaI_topLeft_set(swigCPtr, this, PointI.getCPtr(value), value);
+  }
+
+  public PointI getTopLeft() {
+    long cPtr = OsmAndCoreJNI.AreaI_topLeft_get(swigCPtr, this);
+    return (cPtr == 0) ? null : new PointI(cPtr, false);
+  }
+
+  public void setBottomRight(PointI value) {
+    OsmAndCoreJNI.AreaI_bottomRight_set(swigCPtr, this, PointI.getCPtr(value), value);
+  }
+
+  public PointI getBottomRight() {
+    long cPtr = OsmAndCoreJNI.AreaI_bottomRight_get(swigCPtr, this);
+    return (cPtr == 0) ? null : new PointI(cPtr, false);
+  }
+
+  public boolean contains(int x, int y) {
+    return OsmAndCoreJNI.AreaI_contains__SWIG_0(swigCPtr, this, x, y);
+  }
+
+  public boolean contains(PointI p) {
+    return OsmAndCoreJNI.AreaI_contains__SWIG_1(swigCPtr, this, PointI.getCPtr(p), p);
+  }
+
+  public boolean contains(int t, int l, int b, int r) {
+    return OsmAndCoreJNI.AreaI_contains__SWIG_2(swigCPtr, this, t, l, b, r);
+  }
+
+  public boolean contains(AreaI that) {
+    return OsmAndCoreJNI.AreaI_contains__SWIG_3(swigCPtr, this, AreaI.getCPtr(that), that);
+  }
+
+  public boolean intersects(int t, int l, int b, int r) {
+    return OsmAndCoreJNI.AreaI_intersects__SWIG_0(swigCPtr, this, t, l, b, r);
+  }
+
+  public boolean intersects(AreaI that) {
+    return OsmAndCoreJNI.AreaI_intersects__SWIG_1(swigCPtr, this, AreaI.getCPtr(that), that);
+  }
+
+  public boolean contains(OOBBI that) {
+    return OsmAndCoreJNI.AreaI_contains__SWIG_4(swigCPtr, this, OOBBI.getCPtr(that), that);
+  }
+
+  public boolean intersects(OOBBI that) {
+    return OsmAndCoreJNI.AreaI_intersects__SWIG_2(swigCPtr, this, OOBBI.getCPtr(that), that);
+  }
+
+  public int width() {
+    return OsmAndCoreJNI.AreaI_width(swigCPtr, this);
+  }
+
+  public int height() {
+    return OsmAndCoreJNI.AreaI_height(swigCPtr, this);
+  }
+
+  public PointI center() {
+    return new PointI(OsmAndCoreJNI.AreaI_center(swigCPtr, this), true);
+  }
+
+  public PointI topRight() {
+    return new PointI(OsmAndCoreJNI.AreaI_topRight(swigCPtr, this), true);
+  }
+
+  public PointI bottomLeft() {
+    return new PointI(OsmAndCoreJNI.AreaI_bottomLeft(swigCPtr, this), true);
+  }
+
+  public AreaI getQuadrant(Quadrant quadrant) {
+    return new AreaI(OsmAndCoreJNI.AreaI_getQuadrant(swigCPtr, this, quadrant.swigValue()), true);
+  }
+
+  public AreaI getEnlargedToInclude(PointI p) {
+    return new AreaI(OsmAndCoreJNI.AreaI_getEnlargedToInclude(swigCPtr, this, PointI.getCPtr(p), p), true);
+  }
+
+  public AreaI getEnlargedBy(PointI delta) {
+    return new AreaI(OsmAndCoreJNI.AreaI_getEnlargedBy__SWIG_0(swigCPtr, this, PointI.getCPtr(delta), delta), true);
+  }
+
+  public AreaI getEnlargedBy(int dt, int dl, int db, int dr) {
+    return new AreaI(OsmAndCoreJNI.AreaI_getEnlargedBy__SWIG_1(swigCPtr, this, dt, dl, db, dr), true);
+  }
+
+  public static AreaI largest() {
+    return new AreaI(OsmAndCoreJNI.AreaI_largest(), true);
+  }
+
+  public static AreaI fromCenterAndSize(int cx, int cy, int width, int height) {
+    return new AreaI(OsmAndCoreJNI.AreaI_fromCenterAndSize(cx, cy, width, height), true);
+  }
+
+}

JNI/src/net/osmand/core/jni/AtlasMapRendererConfiguration.java

@@ -0,0 +1,104 @@
+/* ----------------------------------------------------------------------------
+ * 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 AtlasMapRendererConfiguration extends MapRendererConfiguration {
+  private long swigCPtr;
+  private boolean swigCMemOwnDerived;
+
+  protected AtlasMapRendererConfiguration(long cPtr, boolean cMemoryOwn) {
+    super(OsmAndCoreJNI.AtlasMapRendererConfiguration_SWIGSmartPtrUpcast(cPtr), true);
+    swigCMemOwnDerived = cMemoryOwn;
+    swigCPtr = cPtr;
+  }
+
+  protected static long getCPtr(AtlasMapRendererConfiguration obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+
+  protected void finalize() {
+    delete();
+  }
+
+  public synchronized void delete() {
+    if (swigCPtr != 0) {
+      if (swigCMemOwnDerived) {
+        swigCMemOwnDerived = false;
+        OsmAndCoreJNI.delete_AtlasMapRendererConfiguration(swigCPtr);
+      }
+      swigCPtr = 0;
+    }
+    super.delete();
+  }
+
+  public AtlasMapRendererConfiguration() {
+    this(OsmAndCoreJNI.new_AtlasMapRendererConfiguration(), true);
+  }
+
+  public void setReferenceTileSizeOnScreenInPixels(long value) {
+    OsmAndCoreJNI.AtlasMapRendererConfiguration_referenceTileSizeOnScreenInPixels_set(swigCPtr, this, value);
+  }
+
+  public long getReferenceTileSizeOnScreenInPixels() {
+    return OsmAndCoreJNI.AtlasMapRendererConfiguration_referenceTileSizeOnScreenInPixels_get(swigCPtr, this);
+  }
+
+  public void copyTo(MapRendererConfiguration other) {
+    OsmAndCoreJNI.AtlasMapRendererConfiguration_copyTo(swigCPtr, this, getCPtr(other), other);
+  }
+
+  public MapRendererConfiguration createCopy() {
+    long cPtr = OsmAndCoreJNI.AtlasMapRendererConfiguration_createCopy(swigCPtr, this);
+    return (cPtr == 0) ? null : new MapRendererConfiguration(cPtr, true);
+  }
+
+  static public class Casts {
+    private long swigCPtr;
+    protected boolean swigCMemOwn;
+  
+    protected Casts(long cPtr, boolean cMemoryOwn) {
+      swigCMemOwn = cMemoryOwn;
+      swigCPtr = cPtr;
+    }
+  
+    protected static long getCPtr(Casts obj) {
+      return (obj == null) ? 0 : obj.swigCPtr;
+    }
+  
+    protected void finalize() {
+      delete();
+    }
+  
+    public synchronized void delete() {
+      if (swigCPtr != 0) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          OsmAndCoreJNI.delete_AtlasMapRendererConfiguration_Casts(swigCPtr);
+        }
+        swigCPtr = 0;
+      }
+    }
+  
+    public static AtlasMapRendererConfiguration upcastFrom(MapRendererConfiguration input) {
+      long cPtr = OsmAndCoreJNI.AtlasMapRendererConfiguration_Casts_upcastFrom(MapRendererConfiguration.getCPtr(input), input);
+      return (cPtr == 0) ? null : new AtlasMapRendererConfiguration(cPtr, true);
+    }
+  
+    public static MapRendererConfiguration downcastTo_MapRendererConfiguration(AtlasMapRendererConfiguration input) {
+      long cPtr = OsmAndCoreJNI.AtlasMapRendererConfiguration_Casts_downcastTo_MapRendererConfiguration(AtlasMapRendererConfiguration.getCPtr(input), input);
+      return (cPtr == 0) ? null : new MapRendererConfiguration(cPtr, true);
+    }
+  
+    public Casts() {
+      this(OsmAndCoreJNI.new_AtlasMapRendererConfiguration_Casts(), true);
+    }
+  
+  }
+
+}

JNI/src/net/osmand/core/jni/BinaryMapDataProvider.java

@@ -0,0 +1,69 @@
+/* ----------------------------------------------------------------------------
+ * 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 BinaryMapDataProvider extends IMapTiledDataProvider {
+  private long swigCPtr;
+  private boolean swigCMemOwnDerived;
+
+  protected BinaryMapDataProvider(long cPtr, boolean cMemoryOwn) {
+    super(OsmAndCoreJNI.BinaryMapDataProvider_SWIGSmartPtrUpcast(cPtr), true);
+    swigCMemOwnDerived = cMemoryOwn;
+    swigCPtr = cPtr;
+  }
+
+  protected static long getCPtr(BinaryMapDataProvider obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+
+  protected void finalize() {
+    delete();
+  }
+
+  public synchronized void delete() {
+    if (swigCPtr != 0) {
+      if (swigCMemOwnDerived) {
+        swigCMemOwnDerived = false;
+        OsmAndCoreJNI.delete_BinaryMapDataProvider(swigCPtr);
+      }
+      swigCPtr = 0;
+    }
+    super.delete();
+  }
+
+  public BinaryMapDataProvider(IObfsCollection obfsCollection) {
+    this(OsmAndCoreJNI.new_BinaryMapDataProvider(IObfsCollection.getCPtr(obfsCollection), obfsCollection), true);
+  }
+
+  public IObfsCollection getObfsCollection() {
+    long cPtr = OsmAndCoreJNI.BinaryMapDataProvider_obfsCollection_get(swigCPtr, this);
+    return (cPtr == 0) ? null : new IObfsCollection(cPtr, true);
+  }
+
+  public ZoomLevel getMinZoom() {
+    return ZoomLevel.swigToEnum(OsmAndCoreJNI.BinaryMapDataProvider_getMinZoom(swigCPtr, this));
+  }
+
+  public ZoomLevel getMaxZoom() {
+    return ZoomLevel.swigToEnum(OsmAndCoreJNI.BinaryMapDataProvider_getMaxZoom(swigCPtr, this));
+  }
+
+  public boolean obtainData(TileId tileId, ZoomLevel zoom, MapTiledData outTiledData, SWIGTYPE_p_OsmAnd__IQueryController queryController) {
+    return OsmAndCoreJNI.BinaryMapDataProvider_obtainData__SWIG_0(swigCPtr, this, TileId.getCPtr(tileId), tileId, zoom.swigValue(), MapTiledData.getCPtr(outTiledData), outTiledData, SWIGTYPE_p_OsmAnd__IQueryController.getCPtr(queryController));
+  }
+
+  public boolean obtainData(TileId tileId, ZoomLevel zoom, MapTiledData outTiledData) {
+    return OsmAndCoreJNI.BinaryMapDataProvider_obtainData__SWIG_1(swigCPtr, this, TileId.getCPtr(tileId), tileId, zoom.swigValue(), MapTiledData.getCPtr(outTiledData), outTiledData);
+  }
+
+  public boolean obtainData(TileId tileId, ZoomLevel zoom, MapTiledData outTiledData, SWIGTYPE_p_BinaryMapDataProvider_Metrics__Metric_obtainData metric, SWIGTYPE_p_OsmAnd__IQueryController queryController) {
+    return OsmAndCoreJNI.BinaryMapDataProvider_obtainData__SWIG_2(swigCPtr, this, TileId.getCPtr(tileId), tileId, zoom.swigValue(), MapTiledData.getCPtr(outTiledData), outTiledData, SWIGTYPE_p_BinaryMapDataProvider_Metrics__Metric_obtainData.getCPtr(metric), SWIGTYPE_p_OsmAnd__IQueryController.getCPtr(queryController));
+  }
+
+}

JNI/src/net/osmand/core/jni/BinaryMapDataTile.java

@@ -0,0 +1,60 @@
+/* ----------------------------------------------------------------------------
+ * 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 BinaryMapDataTile extends MapTiledData {
+  private long swigCPtr;
+  private boolean swigCMemOwnDerived;
+
+  protected BinaryMapDataTile(long cPtr, boolean cMemoryOwn) {
+    super(OsmAndCoreJNI.BinaryMapDataTile_SWIGSmartPtrUpcast(cPtr), true);
+    swigCMemOwnDerived = cMemoryOwn;
+    swigCPtr = cPtr;
+  }
+
+  protected static long getCPtr(BinaryMapDataTile obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+
+  protected void finalize() {
+    delete();
+  }
+
+  public synchronized void delete() {
+    if (swigCPtr != 0) {
+      if (swigCMemOwnDerived) {
+        swigCMemOwnDerived = false;
+        OsmAndCoreJNI.delete_BinaryMapDataTile(swigCPtr);
+      }
+      swigCPtr = 0;
+    }
+    super.delete();
+  }
+
+  public SWIGTYPE_p_std__weak_ptrT_ObfMapSectionReader__DataBlocksCache_t getDataBlocksCache() {
+    return new SWIGTYPE_p_std__weak_ptrT_ObfMapSectionReader__DataBlocksCache_t(OsmAndCoreJNI.BinaryMapDataTile_dataBlocksCache_get(swigCPtr, this), true);
+  }
+
+  public SWIGTYPE_p_QListT_std__shared_ptrT_ObfMapSectionReader__DataBlock_const_t_t getReferencedDataBlocks() {
+    return new SWIGTYPE_p_QListT_std__shared_ptrT_ObfMapSectionReader__DataBlock_const_t_t(OsmAndCoreJNI.BinaryMapDataTile_referencedDataBlocks_get(swigCPtr, this), false);
+  }
+
+  public MapFoundationType getTileFoundation() {
+    return MapFoundationType.swigToEnum(OsmAndCoreJNI.BinaryMapDataTile_tileFoundation_get(swigCPtr, this));
+  }
+
+  public SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__Model__BinaryMapObject_const_t_t getMapObjects() {
+    return new SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__Model__BinaryMapObject_const_t_t(OsmAndCoreJNI.BinaryMapDataTile_mapObjects_get(swigCPtr, this), false);
+  }
+
+  public void releaseConsumableContent() {
+    OsmAndCoreJNI.BinaryMapDataTile_releaseConsumableContent(swigCPtr, this);
+  }
+
+}

JNI/src/net/osmand/core/jni/BinaryMapPrimitivesProvider.java

@@ -0,0 +1,82 @@
+/* ----------------------------------------------------------------------------
+ * 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 BinaryMapPrimitivesProvider extends IMapTiledDataProvider {
+  private long swigCPtr;
+  private boolean swigCMemOwnDerived;
+
+  protected BinaryMapPrimitivesProvider(long cPtr, boolean cMemoryOwn) {
+    super(OsmAndCoreJNI.BinaryMapPrimitivesProvider_SWIGSmartPtrUpcast(cPtr), true);
+    swigCMemOwnDerived = cMemoryOwn;
+    swigCPtr = cPtr;
+  }
+
+  protected static long getCPtr(BinaryMapPrimitivesProvider obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+
+  protected void finalize() {
+    delete();
+  }
+
+  public synchronized void delete() {
+    if (swigCPtr != 0) {
+      if (swigCMemOwnDerived) {
+        swigCMemOwnDerived = false;
+        OsmAndCoreJNI.delete_BinaryMapPrimitivesProvider(swigCPtr);
+      }
+      swigCPtr = 0;
+    }
+    super.delete();
+  }
+
+  public BinaryMapPrimitivesProvider(BinaryMapDataProvider dataProvider, Primitiviser primitiviser, long tileSize) {
+    this(OsmAndCoreJNI.new_BinaryMapPrimitivesProvider__SWIG_0(BinaryMapDataProvider.getCPtr(dataProvider), dataProvider, Primitiviser.getCPtr(primitiviser), primitiviser, tileSize), true);
+  }
+
+  public BinaryMapPrimitivesProvider(BinaryMapDataProvider dataProvider, Primitiviser primitiviser) {
+    this(OsmAndCoreJNI.new_BinaryMapPrimitivesProvider__SWIG_1(BinaryMapDataProvider.getCPtr(dataProvider), dataProvider, Primitiviser.getCPtr(primitiviser), primitiviser), true);
+  }
+
+  public BinaryMapDataProvider getDataProvider() {
+    long cPtr = OsmAndCoreJNI.BinaryMapPrimitivesProvider_dataProvider_get(swigCPtr, this);
+    return (cPtr == 0) ? null : new BinaryMapDataProvider(cPtr, true);
+  }
+
+  public Primitiviser getPrimitiviser() {
+    long cPtr = OsmAndCoreJNI.BinaryMapPrimitivesProvider_primitiviser_get(swigCPtr, this);
+    return (cPtr == 0) ? null : new Primitiviser(cPtr, true);
+  }
+
+  public long getTileSize() {
+    return OsmAndCoreJNI.BinaryMapPrimitivesProvider_tileSize_get(swigCPtr, this);
+  }
+
+  public ZoomLevel getMinZoom() {
+    return ZoomLevel.swigToEnum(OsmAndCoreJNI.BinaryMapPrimitivesProvider_getMinZoom(swigCPtr, this));
+  }
+
+  public ZoomLevel getMaxZoom() {
+    return ZoomLevel.swigToEnum(OsmAndCoreJNI.BinaryMapPrimitivesProvider_getMaxZoom(swigCPtr, this));
+  }
+
+  public boolean obtainData(TileId tileId, ZoomLevel zoom, MapTiledData outTiledData, SWIGTYPE_p_OsmAnd__IQueryController queryController) {
+    return OsmAndCoreJNI.BinaryMapPrimitivesProvider_obtainData__SWIG_0(swigCPtr, this, TileId.getCPtr(tileId), tileId, zoom.swigValue(), MapTiledData.getCPtr(outTiledData), outTiledData, SWIGTYPE_p_OsmAnd__IQueryController.getCPtr(queryController));
+  }
+
+  public boolean obtainData(TileId tileId, ZoomLevel zoom, MapTiledData outTiledData) {
+    return OsmAndCoreJNI.BinaryMapPrimitivesProvider_obtainData__SWIG_1(swigCPtr, this, TileId.getCPtr(tileId), tileId, zoom.swigValue(), MapTiledData.getCPtr(outTiledData), outTiledData);
+  }
+
+  public boolean obtainData(TileId tileId, ZoomLevel zoom, MapTiledData outTiledData, SWIGTYPE_p_BinaryMapPrimitivesProvider_Metrics__Metric_obtainData metric, SWIGTYPE_p_OsmAnd__IQueryController queryController) {
+    return OsmAndCoreJNI.BinaryMapPrimitivesProvider_obtainData__SWIG_2(swigCPtr, this, TileId.getCPtr(tileId), tileId, zoom.swigValue(), MapTiledData.getCPtr(outTiledData), outTiledData, SWIGTYPE_p_BinaryMapPrimitivesProvider_Metrics__Metric_obtainData.getCPtr(metric), SWIGTYPE_p_OsmAnd__IQueryController.getCPtr(queryController));
+  }
+
+}

JNI/src/net/osmand/core/jni/BinaryMapPrimitivesTile.java

@@ -0,0 +1,54 @@
+/* ----------------------------------------------------------------------------
+ * 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 BinaryMapPrimitivesTile extends MapTiledData {
+  private long swigCPtr;
+  private boolean swigCMemOwnDerived;
+
+  protected BinaryMapPrimitivesTile(long cPtr, boolean cMemoryOwn) {
+    super(OsmAndCoreJNI.BinaryMapPrimitivesTile_SWIGSmartPtrUpcast(cPtr), true);
+    swigCMemOwnDerived = cMemoryOwn;
+    swigCPtr = cPtr;
+  }
+
+  protected static long getCPtr(BinaryMapPrimitivesTile obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+
+  protected void finalize() {
+    delete();
+  }
+
+  public synchronized void delete() {
+    if (swigCPtr != 0) {
+      if (swigCMemOwnDerived) {
+        swigCMemOwnDerived = false;
+        OsmAndCoreJNI.delete_BinaryMapPrimitivesTile(swigCPtr);
+      }
+      swigCPtr = 0;
+    }
+    super.delete();
+  }
+
+  public BinaryMapDataTile getDataTile() {
+    long cPtr = OsmAndCoreJNI.BinaryMapPrimitivesTile_dataTile_get(swigCPtr, this);
+    return (cPtr == 0) ? null : new BinaryMapDataTile(cPtr, true);
+  }
+
+  public Primitiviser.PrimitivisedArea getPrimitivisedArea() {
+    long cPtr = OsmAndCoreJNI.BinaryMapPrimitivesTile_primitivisedArea_get(swigCPtr, this);
+    return (cPtr == 0) ? null : new Primitiviser.PrimitivisedArea(cPtr, true);
+  }
+
+  public void releaseConsumableContent() {
+    OsmAndCoreJNI.BinaryMapPrimitivesTile_releaseConsumableContent(swigCPtr, this);
+  }
+
+}

JNI/src/net/osmand/core/jni/BinaryMapRasterBitmapTileProvider.java

@@ -0,0 +1,73 @@
+/* ----------------------------------------------------------------------------
+ * 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 BinaryMapRasterBitmapTileProvider extends IMapRasterBitmapTileProvider {
+  private long swigCPtr;
+  private boolean swigCMemOwnDerived;
+
+  protected BinaryMapRasterBitmapTileProvider(long cPtr, boolean cMemoryOwn) {
+    super(OsmAndCoreJNI.BinaryMapRasterBitmapTileProvider_SWIGSmartPtrUpcast(cPtr), true);
+    swigCMemOwnDerived = cMemoryOwn;
+    swigCPtr = cPtr;
+  }
+
+  protected static long getCPtr(BinaryMapRasterBitmapTileProvider obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+
+  protected void finalize() {
+    delete();
+  }
+
+  public synchronized void delete() {
+    if (swigCPtr != 0) {
+      if (swigCMemOwnDerived) {
+        swigCMemOwnDerived = false;
+        OsmAndCoreJNI.delete_BinaryMapRasterBitmapTileProvider(swigCPtr);
+      }
+      swigCPtr = 0;
+    }
+    super.delete();
+  }
+
+  public BinaryMapPrimitivesProvider getPrimitivesProvider() {
+    long cPtr = OsmAndCoreJNI.BinaryMapRasterBitmapTileProvider_primitivesProvider_get(swigCPtr, this);
+    return (cPtr == 0) ? null : new BinaryMapPrimitivesProvider(cPtr, true);
+  }
+
+  public float getTileDensityFactor() {
+    return OsmAndCoreJNI.BinaryMapRasterBitmapTileProvider_getTileDensityFactor(swigCPtr, this);
+  }
+
+  public long getTileSize() {
+    return OsmAndCoreJNI.BinaryMapRasterBitmapTileProvider_getTileSize(swigCPtr, this);
+  }
+
+  public boolean obtainData(TileId tileId, ZoomLevel zoom, MapTiledData outTiledData, SWIGTYPE_p_OsmAnd__IQueryController queryController) {
+    return OsmAndCoreJNI.BinaryMapRasterBitmapTileProvider_obtainData__SWIG_0(swigCPtr, this, TileId.getCPtr(tileId), tileId, zoom.swigValue(), MapTiledData.getCPtr(outTiledData), outTiledData, SWIGTYPE_p_OsmAnd__IQueryController.getCPtr(queryController));
+  }
+
+  public boolean obtainData(TileId tileId, ZoomLevel zoom, MapTiledData outTiledData) {
+    return OsmAndCoreJNI.BinaryMapRasterBitmapTileProvider_obtainData__SWIG_1(swigCPtr, this, TileId.getCPtr(tileId), tileId, zoom.swigValue(), MapTiledData.getCPtr(outTiledData), outTiledData);
+  }
+
+  public boolean obtainData(TileId tileId, ZoomLevel zoom, MapTiledData outTiledData, SWIGTYPE_p_BinaryMapRasterBitmapTileProvider_Metrics__Metric_obtainData metric, SWIGTYPE_p_OsmAnd__IQueryController queryController) {
+    return OsmAndCoreJNI.BinaryMapRasterBitmapTileProvider_obtainData__SWIG_2(swigCPtr, this, TileId.getCPtr(tileId), tileId, zoom.swigValue(), MapTiledData.getCPtr(outTiledData), outTiledData, SWIGTYPE_p_BinaryMapRasterBitmapTileProvider_Metrics__Metric_obtainData.getCPtr(metric), SWIGTYPE_p_OsmAnd__IQueryController.getCPtr(queryController));
+  }
+
+  public ZoomLevel getMinZoom() {
+    return ZoomLevel.swigToEnum(OsmAndCoreJNI.BinaryMapRasterBitmapTileProvider_getMinZoom(swigCPtr, this));
+  }
+
+  public ZoomLevel getMaxZoom() {
+    return ZoomLevel.swigToEnum(OsmAndCoreJNI.BinaryMapRasterBitmapTileProvider_getMaxZoom(swigCPtr, this));
+  }
+
+}

JNI/src/net/osmand/core/jni/BinaryMapRasterBitmapTileProvider_Software.java

@@ -0,0 +1,44 @@
+/* ----------------------------------------------------------------------------
+ * 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 BinaryMapRasterBitmapTileProvider_Software extends BinaryMapRasterBitmapTileProvider {
+  private long swigCPtr;
+  private boolean swigCMemOwnDerived;
+
+  protected BinaryMapRasterBitmapTileProvider_Software(long cPtr, boolean cMemoryOwn) {
+    super(OsmAndCoreJNI.BinaryMapRasterBitmapTileProvider_Software_SWIGSmartPtrUpcast(cPtr), true);
+    swigCMemOwnDerived = cMemoryOwn;
+    swigCPtr = cPtr;
+  }
+
+  protected static long getCPtr(BinaryMapRasterBitmapTileProvider_Software obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+
+  protected void finalize() {
+    delete();
+  }
+
+  public synchronized void delete() {
+    if (swigCPtr != 0) {
+      if (swigCMemOwnDerived) {
+        swigCMemOwnDerived = false;
+        OsmAndCoreJNI.delete_BinaryMapRasterBitmapTileProvider_Software(swigCPtr);
+      }
+      swigCPtr = 0;
+    }
+    super.delete();
+  }
+
+  public BinaryMapRasterBitmapTileProvider_Software(BinaryMapPrimitivesProvider primitivesProvider) {
+    this(OsmAndCoreJNI.new_BinaryMapRasterBitmapTileProvider_Software(BinaryMapPrimitivesProvider.getCPtr(primitivesProvider), primitivesProvider), true);
+  }
+
+}

JNI/src/net/osmand/core/jni/BinaryMapRasterizedTile.java

@@ -0,0 +1,49 @@
+/* ----------------------------------------------------------------------------
+ * 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 BinaryMapRasterizedTile extends RasterBitmapTile {
+  private long swigCPtr;
+  private boolean swigCMemOwnDerived;
+
+  protected BinaryMapRasterizedTile(long cPtr, boolean cMemoryOwn) {
+    super(OsmAndCoreJNI.BinaryMapRasterizedTile_SWIGSmartPtrUpcast(cPtr), true);
+    swigCMemOwnDerived = cMemoryOwn;
+    swigCPtr = cPtr;
+  }
+
+  protected static long getCPtr(BinaryMapRasterizedTile obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+
+  protected void finalize() {
+    delete();
+  }
+
+  public synchronized void delete() {
+    if (swigCPtr != 0) {
+      if (swigCMemOwnDerived) {
+        swigCMemOwnDerived = false;
+        OsmAndCoreJNI.delete_BinaryMapRasterizedTile(swigCPtr);
+      }
+      swigCPtr = 0;
+    }
+    super.delete();
+  }
+
+  public BinaryMapRasterizedTile(BinaryMapPrimitivesTile binaryMapTile, SWIGTYPE_p_std__shared_ptrT_SkBitmap_const_t bitmap, AlphaChannelData alphaChannelData, float densityFactor, TileId tileId, ZoomLevel zoom) {
+    this(OsmAndCoreJNI.new_BinaryMapRasterizedTile(BinaryMapPrimitivesTile.getCPtr(binaryMapTile), binaryMapTile, SWIGTYPE_p_std__shared_ptrT_SkBitmap_const_t.getCPtr(bitmap), alphaChannelData.swigValue(), densityFactor, TileId.getCPtr(tileId), tileId, zoom.swigValue()), true);
+  }
+
+  public BinaryMapPrimitivesTile getBinaryMapTile() {
+    long cPtr = OsmAndCoreJNI.BinaryMapRasterizedTile_binaryMapTile_get(swigCPtr, this);
+    return (cPtr == 0) ? null : new BinaryMapPrimitivesTile(cPtr, true);
+  }
+
+}

JNI/src/net/osmand/core/jni/BinaryMapStaticSymbolsProvider.java

@@ -0,0 +1,65 @@
+/* ----------------------------------------------------------------------------
+ * 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 BinaryMapStaticSymbolsProvider extends IMapTiledSymbolsProvider {
+  private long swigCPtr;
+  private boolean swigCMemOwnDerived;
+
+  protected BinaryMapStaticSymbolsProvider(long cPtr, boolean cMemoryOwn) {
+    super(OsmAndCoreJNI.BinaryMapStaticSymbolsProvider_SWIGSmartPtrUpcast(cPtr), true);
+    swigCMemOwnDerived = cMemoryOwn;
+    swigCPtr = cPtr;
+  }
+
+  protected static long getCPtr(BinaryMapStaticSymbolsProvider obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+
+  protected void finalize() {
+    delete();
+  }
+
+  public synchronized void delete() {
+    if (swigCPtr != 0) {
+      if (swigCMemOwnDerived) {
+        swigCMemOwnDerived = false;
+        OsmAndCoreJNI.delete_BinaryMapStaticSymbolsProvider(swigCPtr);
+      }
+      swigCPtr = 0;
+    }
+    super.delete();
+  }
+
+  public BinaryMapStaticSymbolsProvider(BinaryMapPrimitivesProvider primitivesProvider, long referenceTileSizeInPixels) {
+    this(OsmAndCoreJNI.new_BinaryMapStaticSymbolsProvider(BinaryMapPrimitivesProvider.getCPtr(primitivesProvider), primitivesProvider, referenceTileSizeInPixels), true);
+  }
+
+  public BinaryMapPrimitivesProvider getPrimitivesProvider() {
+    long cPtr = OsmAndCoreJNI.BinaryMapStaticSymbolsProvider_primitivesProvider_get(swigCPtr, this);
+    return (cPtr == 0) ? null : new BinaryMapPrimitivesProvider(cPtr, true);
+  }
+
+  public void setReferenceTileSizeInPixels(long value) {
+    OsmAndCoreJNI.BinaryMapStaticSymbolsProvider_referenceTileSizeInPixels_set(swigCPtr, this, value);
+  }
+
+  public long getReferenceTileSizeInPixels() {
+    return OsmAndCoreJNI.BinaryMapStaticSymbolsProvider_referenceTileSizeInPixels_get(swigCPtr, this);
+  }
+
+  public ZoomLevel getMinZoom() {
+    return ZoomLevel.swigToEnum(OsmAndCoreJNI.BinaryMapStaticSymbolsProvider_getMinZoom(swigCPtr, this));
+  }
+
+  public ZoomLevel getMaxZoom() {
+    return ZoomLevel.swigToEnum(OsmAndCoreJNI.BinaryMapStaticSymbolsProvider_getMaxZoom(swigCPtr, this));
+  }
+
+}

JNI/src/net/osmand/core/jni/BinaryMapStaticSymbolsTile.java

@@ -0,0 +1,45 @@
+/* ----------------------------------------------------------------------------
+ * 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 BinaryMapStaticSymbolsTile extends TiledMapSymbolsData {
+  private long swigCPtr;
+  private boolean swigCMemOwnDerived;
+
+  protected BinaryMapStaticSymbolsTile(long cPtr, boolean cMemoryOwn) {
+    super(OsmAndCoreJNI.BinaryMapStaticSymbolsTile_SWIGSmartPtrUpcast(cPtr), true);
+    swigCMemOwnDerived = cMemoryOwn;
+    swigCPtr = cPtr;
+  }
+
+  protected static long getCPtr(BinaryMapStaticSymbolsTile obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+
+  protected void finalize() {
+    delete();
+  }
+
+  public synchronized void delete() {
+    if (swigCPtr != 0) {
+      if (swigCMemOwnDerived) {
+        swigCMemOwnDerived = false;
+        OsmAndCoreJNI.delete_BinaryMapStaticSymbolsTile(swigCPtr);
+      }
+      swigCPtr = 0;
+    }
+    super.delete();
+  }
+
+  public BinaryMapPrimitivesTile getDataTile() {
+    long cPtr = OsmAndCoreJNI.BinaryMapStaticSymbolsTile_dataTile_get(swigCPtr, this);
+    return (cPtr == 0) ? null : new BinaryMapPrimitivesTile(cPtr, true);
+  }
+
+}

JNI/src/net/osmand/core/jni/BoolPtr.java

@@ -0,0 +1,60 @@
+/* ----------------------------------------------------------------------------
+ * 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 BoolPtr {
+  private long swigCPtr;
+  protected boolean swigCMemOwn;
+
+  protected BoolPtr(long cPtr, boolean cMemoryOwn) {
+    swigCMemOwn = cMemoryOwn;
+    swigCPtr = cPtr;
+  }
+
+  protected static long getCPtr(BoolPtr obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+
+  protected void finalize() {
+    delete();
+  }
+
+  public synchronized void delete() {
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        OsmAndCoreJNI.delete_BoolPtr(swigCPtr);
+      }
+      swigCPtr = 0;
+    }
+  }
+
+  public BoolPtr() {
+    this(OsmAndCoreJNI.new_BoolPtr(), true);
+  }
+
+  public void assign(boolean value) {
+    OsmAndCoreJNI.BoolPtr_assign(swigCPtr, this, value);
+  }
+
+  public boolean value() {
+    return OsmAndCoreJNI.BoolPtr_value(swigCPtr, this);
+  }
+
+  public SWIGTYPE_p_bool cast() {
+    long cPtr = OsmAndCoreJNI.BoolPtr_cast(swigCPtr, this);
+    return (cPtr == 0) ? null : new SWIGTYPE_p_bool(cPtr, false);
+  }
+
+  public static BoolPtr frompointer(SWIGTYPE_p_bool t) {
+    long cPtr = OsmAndCoreJNI.BoolPtr_frompointer(SWIGTYPE_p_bool.getCPtr(t));
+    return (cPtr == 0) ? null : new BoolPtr(cPtr, false);
+  }
+
+}

JNI/src/net/osmand/core/jni/ColorARGB.java

@@ -0,0 +1,94 @@
+/* ----------------------------------------------------------------------------
+ * 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 ColorARGB {
+  private long swigCPtr;
+  protected boolean swigCMemOwn;
+
+  protected ColorARGB(long cPtr, boolean cMemoryOwn) {
+    swigCMemOwn = cMemoryOwn;
+    swigCPtr = cPtr;
+  }
+
+  protected static long getCPtr(ColorARGB obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+
+  protected void finalize() {
+    delete();
+  }
+
+  public synchronized void delete() {
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        OsmAndCoreJNI.delete_ColorARGB(swigCPtr);
+      }
+      swigCPtr = 0;
+    }
+  }
+
+  public 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_2(a_, r_, g_, b_), true);
+  }
+
+  public ColorARGB(FColorARGB other) {
+    this(OsmAndCoreJNI.new_ColorARGB__SWIG_3(FColorARGB.getCPtr(other), other), true);
+  }
+
+  public void setA(short value) {
+    OsmAndCoreJNI.ColorARGB_a_set(swigCPtr, this, value);
+  }
+
+  public short getA() {
+    return OsmAndCoreJNI.ColorARGB_a_get(swigCPtr, this);
+  }
+
+  public void setR(short value) {
+    OsmAndCoreJNI.ColorARGB_r_set(swigCPtr, this, value);
+  }
+
+  public short getR() {
+    return OsmAndCoreJNI.ColorARGB_r_get(swigCPtr, this);
+  }
+
+  public void setG(short value) {
+    OsmAndCoreJNI.ColorARGB_g_set(swigCPtr, this, value);
+  }
+
+  public short getG() {
+    return OsmAndCoreJNI.ColorARGB_g_get(swigCPtr, this);
+  }
+
+  public void setB(short value) {
+    OsmAndCoreJNI.ColorARGB_b_set(swigCPtr, this, value);
+  }
+
+  public short getB() {
+    return OsmAndCoreJNI.ColorARGB_b_get(swigCPtr, this);
+  }
+
+  public ColorARGB withAlpha(short newAlpha) {
+    return new ColorARGB(OsmAndCoreJNI.ColorARGB_withAlpha(swigCPtr, this, newAlpha), true);
+  }
+
+  public ColorARGB setAlpha(short newAlpha) {
+    return new ColorARGB(OsmAndCoreJNI.ColorARGB_setAlpha(swigCPtr, this, newAlpha), false);
+  }
+
+}

JNI/src/net/osmand/core/jni/ColorRGB.java

@@ -0,0 +1,82 @@
+/* ----------------------------------------------------------------------------
+ * 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 ColorRGB {
+  private long swigCPtr;
+  protected boolean swigCMemOwn;
+
+  protected ColorRGB(long cPtr, boolean cMemoryOwn) {
+    swigCMemOwn = cMemoryOwn;
+    swigCPtr = cPtr;
+  }
+
+  protected static long getCPtr(ColorRGB obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+
+  protected void finalize() {
+    delete();
+  }
+
+  public synchronized void delete() {
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        OsmAndCoreJNI.delete_ColorRGB(swigCPtr);
+      }
+      swigCPtr = 0;
+    }
+  }
+
+  public ColorRGB() {
+    this(OsmAndCoreJNI.new_ColorRGB__SWIG_0(), true);
+  }
+
+  public ColorRGB(short r_, short g_, short b_) {
+    this(OsmAndCoreJNI.new_ColorRGB__SWIG_1(r_, g_, b_), true);
+  }
+
+  public ColorRGB(ColorARGB other) {
+    this(OsmAndCoreJNI.new_ColorRGB__SWIG_2(ColorARGB.getCPtr(other), other), true);
+  }
+
+  public ColorRGB(FColorRGB other) {
+    this(OsmAndCoreJNI.new_ColorRGB__SWIG_3(FColorRGB.getCPtr(other), other), true);
+  }
+
+  public void setR(short value) {
+    OsmAndCoreJNI.ColorRGB_r_set(swigCPtr, this, value);
+  }
+
+  public short getR() {
+    return OsmAndCoreJNI.ColorRGB_r_get(swigCPtr, this);
+  }
+
+  public void setG(short value) {
+    OsmAndCoreJNI.ColorRGB_g_set(swigCPtr, this, value);
+  }
+
+  public short getG() {
+    return OsmAndCoreJNI.ColorRGB_g_get(swigCPtr, this);
+  }
+
+  public void setB(short value) {
+    OsmAndCoreJNI.ColorRGB_b_set(swigCPtr, this, value);
+  }
+
+  public short getB() {
+    return OsmAndCoreJNI.ColorRGB_b_get(swigCPtr, this);
+  }
+
+  public ColorARGB withAlpha(short alpha) {
+    return new ColorARGB(OsmAndCoreJNI.ColorRGB_withAlpha(swigCPtr, this, alpha), true);
+  }
+
+}

JNI/src/net/osmand/core/jni/CoreResourcesEmbeddedBundle.java

@@ -0,0 +1,74 @@
+/* ----------------------------------------------------------------------------
+ * 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 CoreResourcesEmbeddedBundle extends ICoreResourcesProvider {
+  private long swigCPtr;
+  private boolean swigCMemOwnDerived;
+
+  protected CoreResourcesEmbeddedBundle(long cPtr, boolean cMemoryOwn) {
+    super(OsmAndCoreJNI.CoreResourcesEmbeddedBundle_SWIGSmartPtrUpcast(cPtr), true);
+    swigCMemOwnDerived = cMemoryOwn;
+    swigCPtr = cPtr;
+  }
+
+  protected static long getCPtr(CoreResourcesEmbeddedBundle obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+
+  protected void finalize() {
+    delete();
+  }
+
+  public synchronized void delete() {
+    if (swigCPtr != 0) {
+      if (swigCMemOwnDerived) {
+        swigCMemOwnDerived = false;
+        OsmAndCoreJNI.delete_CoreResourcesEmbeddedBundle(swigCPtr);
+      }
+      swigCPtr = 0;
+    }
+    super.delete();
+  }
+
+  public SWIGTYPE_p_QByteArray getResource(String name, float displayDensityFactor, SWIGTYPE_p_bool ok) {
+    return new SWIGTYPE_p_QByteArray(OsmAndCoreJNI.CoreResourcesEmbeddedBundle_getResource__SWIG_0(swigCPtr, this, name, displayDensityFactor, SWIGTYPE_p_bool.getCPtr(ok)), true);
+  }
+
+  public SWIGTYPE_p_QByteArray getResource(String name, float displayDensityFactor) {
+    return new SWIGTYPE_p_QByteArray(OsmAndCoreJNI.CoreResourcesEmbeddedBundle_getResource__SWIG_1(swigCPtr, this, name, displayDensityFactor), true);
+  }
+
+  public SWIGTYPE_p_QByteArray getResource(String name, SWIGTYPE_p_bool ok) {
+    return new SWIGTYPE_p_QByteArray(OsmAndCoreJNI.CoreResourcesEmbeddedBundle_getResource__SWIG_2(swigCPtr, this, name, SWIGTYPE_p_bool.getCPtr(ok)), true);
+  }
+
+  public SWIGTYPE_p_QByteArray getResource(String name) {
+    return new SWIGTYPE_p_QByteArray(OsmAndCoreJNI.CoreResourcesEmbeddedBundle_getResource__SWIG_3(swigCPtr, this, name), true);
+  }
+
+  public boolean containsResource(String name, float displayDensityFactor) {
+    return OsmAndCoreJNI.CoreResourcesEmbeddedBundle_containsResource__SWIG_0(swigCPtr, this, name, displayDensityFactor);
+  }
+
+  public boolean containsResource(String name) {
+    return OsmAndCoreJNI.CoreResourcesEmbeddedBundle_containsResource__SWIG_1(swigCPtr, this, name);
+  }
+
+  public static CoreResourcesEmbeddedBundle loadFromCurrentExecutable() {
+    long cPtr = OsmAndCoreJNI.CoreResourcesEmbeddedBundle_loadFromCurrentExecutable();
+    return (cPtr == 0) ? null : new CoreResourcesEmbeddedBundle(cPtr, true);
+  }
+
+  public static CoreResourcesEmbeddedBundle loadFromLibrary(String libraryNameOrFilename) {
+    long cPtr = OsmAndCoreJNI.CoreResourcesEmbeddedBundle_loadFromLibrary(libraryNameOrFilename);
+    return (cPtr == 0) ? null : new CoreResourcesEmbeddedBundle(cPtr, true);
+  }
+
+}

JNI/src/net/osmand/core/jni/DefaultLogSink.java

@@ -0,0 +1,48 @@
+/* ----------------------------------------------------------------------------
+ * 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 DefaultLogSink extends ILogSink {
+  private long swigCPtr;
+  private boolean swigCMemOwnDerived;
+
+  protected DefaultLogSink(long cPtr, boolean cMemoryOwn) {
+    super(OsmAndCoreJNI.DefaultLogSink_SWIGSmartPtrUpcast(cPtr), true);
+    swigCMemOwnDerived = cMemoryOwn;
+    swigCPtr = cPtr;
+  }
+
+  protected static long getCPtr(DefaultLogSink obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+
+  protected void finalize() {
+    delete();
+  }
+
+  public synchronized void delete() {
+    if (swigCPtr != 0) {
+      if (swigCMemOwnDerived) {
+        swigCMemOwnDerived = false;
+        OsmAndCoreJNI.delete_DefaultLogSink(swigCPtr);
+      }
+      swigCPtr = 0;
+    }
+    super.delete();
+  }
+
+  public DefaultLogSink() {
+    this(OsmAndCoreJNI.new_DefaultLogSink(), true);
+  }
+
+  public void flush() {
+    OsmAndCoreJNI.DefaultLogSink_flush(swigCPtr, this);
+  }
+
+}

JNI/src/net/osmand/core/jni/DoublePtr.java

@@ -0,0 +1,60 @@
+/* ----------------------------------------------------------------------------
+ * 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 DoublePtr {
+  private long swigCPtr;
+  protected boolean swigCMemOwn;
+
+  protected DoublePtr(long cPtr, boolean cMemoryOwn) {
+    swigCMemOwn = cMemoryOwn;
+    swigCPtr = cPtr;
+  }
+
+  protected static long getCPtr(DoublePtr obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+
+  protected void finalize() {
+    delete();
+  }
+
+  public synchronized void delete() {
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        OsmAndCoreJNI.delete_DoublePtr(swigCPtr);
+      }
+      swigCPtr = 0;
+    }
+  }
+
+  public DoublePtr() {
+    this(OsmAndCoreJNI.new_DoublePtr(), true);
+  }
+
+  public void assign(double value) {
+    OsmAndCoreJNI.DoublePtr_assign(swigCPtr, this, value);
+  }
+
+  public double value() {
+    return OsmAndCoreJNI.DoublePtr_value(swigCPtr, this);
+  }
+
+  public SWIGTYPE_p_double cast() {
+    long cPtr = OsmAndCoreJNI.DoublePtr_cast(swigCPtr, this);
+    return (cPtr == 0) ? null : new SWIGTYPE_p_double(cPtr, false);
+  }
+
+  public static DoublePtr frompointer(SWIGTYPE_p_double t) {
+    long cPtr = OsmAndCoreJNI.DoublePtr_frompointer(SWIGTYPE_p_double.getCPtr(t));
+    return (cPtr == 0) ? null : new DoublePtr(cPtr, false);
+  }
+
+}

JNI/src/net/osmand/core/jni/Edge.java

@@ -0,0 +1,55 @@
+/* ----------------------------------------------------------------------------
+ * 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 Edge {
+  Invalid(OsmAndCoreJNI.Edge_Invalid_get()),
+  Left(OsmAndCoreJNI.Edge_Left_get()),
+  Top(OsmAndCoreJNI.Edge_Top_get()),
+  Right(OsmAndCoreJNI.Edge_Right_get()),
+  Bottom(OsmAndCoreJNI.Edge_Bottom_get());
+
+  public final int swigValue() {
+    return swigValue;
+  }
+
+  public static Edge swigToEnum(int swigValue) {
+    Edge[] swigValues = Edge.class.getEnumConstants();
+    if (swigValue < swigValues.length && swigValue >= 0 && swigValues[swigValue].swigValue == swigValue)
+      return swigValues[swigValue];
+    for (Edge swigEnum : swigValues)
+      if (swigEnum.swigValue == swigValue)
+        return swigEnum;
+    throw new IllegalArgumentException("No enum " + Edge.class + " with value " + swigValue);
+  }
+
+  @SuppressWarnings("unused")
+  private Edge() {
+    this.swigValue = SwigNext.next++;
+  }
+
+  @SuppressWarnings("unused")
+  private Edge(int swigValue) {
+    this.swigValue = swigValue;
+    SwigNext.next = swigValue+1;
+  }
+
+  @SuppressWarnings("unused")
+  private Edge(Edge swigEnum) {
+    this.swigValue = swigEnum.swigValue;
+    SwigNext.next = this.swigValue+1;
+  }
+
+  private final int swigValue;
+
+  private static class SwigNext {
+    private static int next = 0;
+  }
+}
+

JNI/src/net/osmand/core/jni/ElevationDataTile.java

@@ -0,0 +1,73 @@
+/* ----------------------------------------------------------------------------
+ * 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 ElevationDataTile extends MapTiledData {
+  private long swigCPtr;
+  private boolean swigCMemOwnDerived;
+
+  protected ElevationDataTile(long cPtr, boolean cMemoryOwn) {
+    super(OsmAndCoreJNI.ElevationDataTile_SWIGSmartPtrUpcast(cPtr), true);
+    swigCMemOwnDerived = cMemoryOwn;
+    swigCPtr = cPtr;
+  }
+
+  protected static long getCPtr(ElevationDataTile obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+
+  protected void finalize() {
+    delete();
+  }
+
+  public synchronized void delete() {
+    if (swigCPtr != 0) {
+      if (swigCMemOwnDerived) {
+        swigCMemOwnDerived = false;
+        OsmAndCoreJNI.delete_ElevationDataTile(swigCPtr);
+      }
+      swigCPtr = 0;
+    }
+    super.delete();
+  }
+
+  public ElevationDataTile(SWIGTYPE_p_float data, long rowLength, long size, TileId tileId, ZoomLevel zoom) {
+    this(OsmAndCoreJNI.new_ElevationDataTile(SWIGTYPE_p_float.getCPtr(data), rowLength, size, TileId.getCPtr(tileId), tileId, zoom.swigValue()), true);
+  }
+
+  public void setData(SWIGTYPE_p_float value) {
+    OsmAndCoreJNI.ElevationDataTile_data_set(swigCPtr, this, SWIGTYPE_p_float.getCPtr(value));
+  }
+
+  public SWIGTYPE_p_float getData() {
+    long cPtr = OsmAndCoreJNI.ElevationDataTile_data_get(swigCPtr, this);
+    return (cPtr == 0) ? null : new SWIGTYPE_p_float(cPtr, false);
+  }
+
+  public void setRowLength(long value) {
+    OsmAndCoreJNI.ElevationDataTile_rowLength_set(swigCPtr, this, value);
+  }
+
+  public long getRowLength() {
+    return OsmAndCoreJNI.ElevationDataTile_rowLength_get(swigCPtr, this);
+  }
+
+  public void setSize(long value) {
+    OsmAndCoreJNI.ElevationDataTile_size_set(swigCPtr, this, value);
+  }
+
+  public long getSize() {
+    return OsmAndCoreJNI.ElevationDataTile_size_get(swigCPtr, this);
+  }
+
+  public void releaseConsumableContent() {
+    OsmAndCoreJNI.ElevationDataTile_releaseConsumableContent(swigCPtr, this);
+  }
+
+}

JNI/src/net/osmand/core/jni/FColorARGB.java

@@ -0,0 +1,86 @@
+/* ----------------------------------------------------------------------------
+ * 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 FColorARGB {
+  private long swigCPtr;
+  protected boolean swigCMemOwn;
+
+  protected FColorARGB(long cPtr, boolean cMemoryOwn) {
+    swigCMemOwn = cMemoryOwn;
+    swigCPtr = cPtr;
+  }
+
+  protected static long getCPtr(FColorARGB obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+
+  protected void finalize() {
+    delete();
+  }
+
+  public synchronized void delete() {
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        OsmAndCoreJNI.delete_FColorARGB(swigCPtr);
+      }
+      swigCPtr = 0;
+    }
+  }
+
+  public FColorARGB() {
+    this(OsmAndCoreJNI.new_FColorARGB__SWIG_0(), true);
+  }
+
+  public FColorARGB(float a_, float r_, float g_, float b_) {
+    this(OsmAndCoreJNI.new_FColorARGB__SWIG_1(a_, r_, g_, b_), true);
+  }
+
+  public void setA(float value) {
+    OsmAndCoreJNI.FColorARGB_a_set(swigCPtr, this, value);
+  }
+
+  public float getA() {
+    return OsmAndCoreJNI.FColorARGB_a_get(swigCPtr, this);
+  }
+
+  public void setR(float value) {
+    OsmAndCoreJNI.FColorARGB_r_set(swigCPtr, this, value);
+  }
+
+  public float getR() {
+    return OsmAndCoreJNI.FColorARGB_r_get(swigCPtr, this);
+  }
+
+  public void setG(float value) {
+    OsmAndCoreJNI.FColorARGB_g_set(swigCPtr, this, value);
+  }
+
+  public float getG() {
+    return OsmAndCoreJNI.FColorARGB_g_get(swigCPtr, this);
+  }
+
+  public void setB(float value) {
+    OsmAndCoreJNI.FColorARGB_b_set(swigCPtr, this, value);
+  }
+
+  public float getB() {
+    return OsmAndCoreJNI.FColorARGB_b_get(swigCPtr, this);
+  }
+
+  public FColorARGB withAlpha(float newAlpha) {
+    return new FColorARGB(OsmAndCoreJNI.FColorARGB_withAlpha(swigCPtr, this, newAlpha), true);
+  }
+
+  public FColorARGB setAlpha(float newAlpha) {
+    return new FColorARGB(OsmAndCoreJNI.FColorARGB_setAlpha(swigCPtr, this, newAlpha), false);
+  }
+
+}

JNI/src/net/osmand/core/jni/FColorRGB.java

@@ -0,0 +1,78 @@
+/* ----------------------------------------------------------------------------
+ * 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 FColorRGB {
+  private long swigCPtr;
+  protected boolean swigCMemOwn;
+
+  protected FColorRGB(long cPtr, boolean cMemoryOwn) {
+    swigCMemOwn = cMemoryOwn;
+    swigCPtr = cPtr;
+  }
+
+  protected static long getCPtr(FColorRGB obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+
+  protected void finalize() {
+    delete();
+  }
+
+  public synchronized void delete() {
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        OsmAndCoreJNI.delete_FColorRGB(swigCPtr);
+      }
+      swigCPtr = 0;
+    }
+  }
+
+  public FColorRGB() {
+    this(OsmAndCoreJNI.new_FColorRGB__SWIG_0(), true);
+  }
+
+  public FColorRGB(float r_, float g_, float b_) {
+    this(OsmAndCoreJNI.new_FColorRGB__SWIG_1(r_, g_, b_), true);
+  }
+
+  public FColorRGB(FColorARGB other) {
+    this(OsmAndCoreJNI.new_FColorRGB__SWIG_2(FColorARGB.getCPtr(other), other), true);
+  }
+
+  public void setR(float value) {
+    OsmAndCoreJNI.FColorRGB_r_set(swigCPtr, this, value);
+  }
+
+  public float getR() {
+    return OsmAndCoreJNI.FColorRGB_r_get(swigCPtr, this);
+  }
+
+  public void setG(float value) {
+    OsmAndCoreJNI.FColorRGB_g_set(swigCPtr, this, value);
+  }
+
+  public float getG() {
+    return OsmAndCoreJNI.FColorRGB_g_get(swigCPtr, this);
+  }
+
+  public void setB(float value) {
+    OsmAndCoreJNI.FColorRGB_b_set(swigCPtr, this, value);
+  }
+
+  public float getB() {
+    return OsmAndCoreJNI.FColorRGB_b_get(swigCPtr, this);
+  }
+
+  public FColorARGB withAlpha(float alpha) {
+    return new FColorARGB(OsmAndCoreJNI.FColorRGB_withAlpha(swigCPtr, this, alpha), true);
+  }
+
+}

JNI/src/net/osmand/core/jni/FloatPtr.java

@@ -0,0 +1,60 @@
+/* ----------------------------------------------------------------------------
+ * 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 FloatPtr {
+  private long swigCPtr;
+  protected boolean swigCMemOwn;
+
+  protected FloatPtr(long cPtr, boolean cMemoryOwn) {
+    swigCMemOwn = cMemoryOwn;
+    swigCPtr = cPtr;
+  }
+
+  protected static long getCPtr(FloatPtr obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+
+  protected void finalize() {
+    delete();
+  }
+
+  public synchronized void delete() {
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        OsmAndCoreJNI.delete_FloatPtr(swigCPtr);
+      }
+      swigCPtr = 0;
+    }
+  }
+
+  public FloatPtr() {
+    this(OsmAndCoreJNI.new_FloatPtr(), true);
+  }
+
+  public void assign(float value) {
+    OsmAndCoreJNI.FloatPtr_assign(swigCPtr, this, value);
+  }
+
+  public float value() {
+    return OsmAndCoreJNI.FloatPtr_value(swigCPtr, this);
+  }
+
+  public SWIGTYPE_p_float cast() {
+    long cPtr = OsmAndCoreJNI.FloatPtr_cast(swigCPtr, this);
+    return (cPtr == 0) ? null : new SWIGTYPE_p_float(cPtr, false);
+  }
+
+  public static FloatPtr frompointer(SWIGTYPE_p_float t) {
+    long cPtr = OsmAndCoreJNI.FloatPtr_frompointer(SWIGTYPE_p_float.getCPtr(t));
+    return (cPtr == 0) ? null : new FloatPtr(cPtr, false);
+  }
+
+}

JNI/src/net/osmand/core/jni/ICoreResourcesProvider.java

@@ -0,0 +1,90 @@
+/* ----------------------------------------------------------------------------
+ * 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 ICoreResourcesProvider {
+  private long swigCPtr;
+  private boolean swigCMemOwn;
+
+  protected ICoreResourcesProvider(long cPtr, boolean cMemoryOwn) {
+    swigCMemOwn = cMemoryOwn;
+    swigCPtr = cPtr;
+  }
+
+  protected static long getCPtr(ICoreResourcesProvider obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+
+  protected void finalize() {
+    delete();
+  }
+
+  public synchronized void delete() {
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        OsmAndCoreJNI.delete_ICoreResourcesProvider(swigCPtr);
+      }
+      swigCPtr = 0;
+    }
+  }
+
+  protected void swigDirectorDisconnect() {
+    swigCMemOwn = false;
+    delete();
+  }
+
+  public void swigReleaseOwnership() {
+    swigCMemOwn = false;
+    OsmAndCoreJNI.ICoreResourcesProvider_change_ownership(this, swigCPtr, false);
+  }
+
+  public void swigTakeOwnership() {
+    swigCMemOwn = true;
+    OsmAndCoreJNI.ICoreResourcesProvider_change_ownership(this, swigCPtr, true);
+  }
+
+  protected ICoreResourcesProvider() {
+    this(OsmAndCoreJNI.new_ICoreResourcesProvider(), true);
+    OsmAndCoreJNI.ICoreResourcesProvider_director_connect(this, swigCPtr, swigCMemOwn, true);
+  }
+
+  public SWIGTYPE_p_QByteArray getResource(String name, float displayDensityFactor, SWIGTYPE_p_bool ok) {
+    return new SWIGTYPE_p_QByteArray(OsmAndCoreJNI.ICoreResourcesProvider_getResource__SWIG_0(swigCPtr, this, name, displayDensityFactor, SWIGTYPE_p_bool.getCPtr(ok)), true);
+  }
+
+  public SWIGTYPE_p_QByteArray getResource(String name, float displayDensityFactor) {
+    return new SWIGTYPE_p_QByteArray(OsmAndCoreJNI.ICoreResourcesProvider_getResource__SWIG_1(swigCPtr, this, name, displayDensityFactor), true);
+  }
+
+  public SWIGTYPE_p_QByteArray getResource(String name, SWIGTYPE_p_bool ok) {
+    return new SWIGTYPE_p_QByteArray(OsmAndCoreJNI.ICoreResourcesProvider_getResource__SWIG_2(swigCPtr, this, name, SWIGTYPE_p_bool.getCPtr(ok)), true);
+  }
+
+  public SWIGTYPE_p_QByteArray getResource(String name) {
+    return new SWIGTYPE_p_QByteArray(OsmAndCoreJNI.ICoreResourcesProvider_getResource__SWIG_3(swigCPtr, this, name), true);
+  }
+
+  public SWIGTYPE_p_std__shared_ptrT_SkBitmap_t getResourceAsBitmap(String name, float displayDensityFactor) {
+    return new SWIGTYPE_p_std__shared_ptrT_SkBitmap_t((getClass() == ICoreResourcesProvider.class) ? OsmAndCoreJNI.ICoreResourcesProvider_getResourceAsBitmap__SWIG_0(swigCPtr, this, name, displayDensityFactor) : OsmAndCoreJNI.ICoreResourcesProvider_getResourceAsBitmapSwigExplicitICoreResourcesProvider__SWIG_0(swigCPtr, this, name, displayDensityFactor), true);
+  }
+
+  public SWIGTYPE_p_std__shared_ptrT_SkBitmap_t getResourceAsBitmap(String name) {
+    return new SWIGTYPE_p_std__shared_ptrT_SkBitmap_t((getClass() == ICoreResourcesProvider.class) ? OsmAndCoreJNI.ICoreResourcesProvider_getResourceAsBitmap__SWIG_1(swigCPtr, this, name) : OsmAndCoreJNI.ICoreResourcesProvider_getResourceAsBitmapSwigExplicitICoreResourcesProvider__SWIG_1(swigCPtr, this, name), true);
+  }
+
+  public boolean containsResource(String name, float displayDensityFactor) {
+    return OsmAndCoreJNI.ICoreResourcesProvider_containsResource__SWIG_0(swigCPtr, this, name, displayDensityFactor);
+  }
+
+  public boolean containsResource(String name) {
+    return OsmAndCoreJNI.ICoreResourcesProvider_containsResource__SWIG_1(swigCPtr, this, name);
+  }
+
+}

JNI/src/net/osmand/core/jni/ILogSink.java

@@ -0,0 +1,42 @@
+/* ----------------------------------------------------------------------------
+ * 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 ILogSink {
+  private long swigCPtr;
+  private boolean swigCMemOwn;
+
+  protected ILogSink(long cPtr, boolean cMemoryOwn) {
+    swigCMemOwn = cMemoryOwn;
+    swigCPtr = cPtr;
+  }
+
+  protected static long getCPtr(ILogSink obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+
+  protected void finalize() {
+    delete();
+  }
+
+  public synchronized void delete() {
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        OsmAndCoreJNI.delete_ILogSink(swigCPtr);
+      }
+      swigCPtr = 0;
+    }
+  }
+
+  public void flush() {
+    OsmAndCoreJNI.ILogSink_flush(swigCPtr, this);
+  }
+
+}

JNI/src/net/osmand/core/jni/IMapDataProvider.java

@@ -0,0 +1,89 @@
+/* ----------------------------------------------------------------------------
+ * 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 IMapDataProvider {
+  private long swigCPtr;
+  private boolean swigCMemOwn;
+
+  protected IMapDataProvider(long cPtr, boolean cMemoryOwn) {
+    swigCMemOwn = cMemoryOwn;
+    swigCPtr = cPtr;
+  }
+
+  protected static long getCPtr(IMapDataProvider obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+
+  protected void finalize() {
+    delete();
+  }
+
+  public synchronized void delete() {
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        OsmAndCoreJNI.delete_IMapDataProvider(swigCPtr);
+      }
+      swigCPtr = 0;
+    }
+  }
+
+  public IMapDataProvider.DataType getDataType() {
+    return IMapDataProvider.DataType.swigToEnum(OsmAndCoreJNI.IMapDataProvider_dataType_get(swigCPtr, this));
+  }
+
+  public enum DataType {
+    Unknown(OsmAndCoreJNI.IMapDataProvider_DataType_Unknown_get()),
+    BinaryMapDataTile,
+    BinaryMapPrimitivesTile,
+    RasterBitmapTile,
+    ElevationDataTile,
+    SymbolsTile,
+    Symbols;
+
+    public final int swigValue() {
+      return swigValue;
+    }
+
+    public static DataType swigToEnum(int swigValue) {
+      DataType[] swigValues = DataType.class.getEnumConstants();
+      if (swigValue < swigValues.length && swigValue >= 0 && swigValues[swigValue].swigValue == swigValue)
+        return swigValues[swigValue];
+      for (DataType swigEnum : swigValues)
+        if (swigEnum.swigValue == swigValue)
+          return swigEnum;
+      throw new IllegalArgumentException("No enum " + DataType.class + " with value " + swigValue);
+    }
+
+    @SuppressWarnings("unused")
+    private DataType() {
+      this.swigValue = SwigNext.next++;
+    }
+
+    @SuppressWarnings("unused")
+    private DataType(int swigValue) {
+      this.swigValue = swigValue;
+      SwigNext.next = swigValue+1;
+    }
+
+    @SuppressWarnings("unused")
+    private DataType(DataType swigEnum) {
+      this.swigValue = swigEnum.swigValue;
+      SwigNext.next = this.swigValue+1;
+    }
+
+    private final int swigValue;
+
+    private static class SwigNext {
+      private static int next = 0;
+    }
+  }
+
+}

JNI/src/net/osmand/core/jni/IMapElevationDataProvider.java

@@ -0,0 +1,44 @@
+/* ----------------------------------------------------------------------------
+ * 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 IMapElevationDataProvider extends IMapTiledDataProvider {
+  private long swigCPtr;
+  private boolean swigCMemOwnDerived;
+
+  protected IMapElevationDataProvider(long cPtr, boolean cMemoryOwn) {
+    super(OsmAndCoreJNI.IMapElevationDataProvider_SWIGSmartPtrUpcast(cPtr), true);
+    swigCMemOwnDerived = cMemoryOwn;
+    swigCPtr = cPtr;
+  }
+
+  protected static long getCPtr(IMapElevationDataProvider obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+
+  protected void finalize() {
+    delete();
+  }
+
+  public synchronized void delete() {
+    if (swigCPtr != 0) {
+      if (swigCMemOwnDerived) {
+        swigCMemOwnDerived = false;
+        OsmAndCoreJNI.delete_IMapElevationDataProvider(swigCPtr);
+      }
+      swigCPtr = 0;
+    }
+    super.delete();
+  }
+
+  public long getTileSize() {
+    return OsmAndCoreJNI.IMapElevationDataProvider_getTileSize(swigCPtr, this);
+  }
+
+}

JNI/src/net/osmand/core/jni/IMapKeyedDataProvider.java

@@ -0,0 +1,52 @@
+/* ----------------------------------------------------------------------------
+ * 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 IMapKeyedDataProvider extends IMapDataProvider {
+  private long swigCPtr;
+  private boolean swigCMemOwnDerived;
+
+  protected IMapKeyedDataProvider(long cPtr, boolean cMemoryOwn) {
+    super(OsmAndCoreJNI.IMapKeyedDataProvider_SWIGSmartPtrUpcast(cPtr), true);
+    swigCMemOwnDerived = cMemoryOwn;
+    swigCPtr = cPtr;
+  }
+
+  protected static long getCPtr(IMapKeyedDataProvider obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+
+  protected void finalize() {
+    delete();
+  }
+
+  public synchronized void delete() {
+    if (swigCPtr != 0) {
+      if (swigCMemOwnDerived) {
+        swigCMemOwnDerived = false;
+        OsmAndCoreJNI.delete_IMapKeyedDataProvider(swigCPtr);
+      }
+      swigCPtr = 0;
+    }
+    super.delete();
+  }
+
+  public SWIGTYPE_p_QListT_void_const_p_t getProvidedDataKeys() {
+    return new SWIGTYPE_p_QListT_void_const_p_t(OsmAndCoreJNI.IMapKeyedDataProvider_getProvidedDataKeys(swigCPtr, this), true);
+  }
+
+  public boolean obtainData(SWIGTYPE_p_void key, MapKeyedData outKeyedData, SWIGTYPE_p_OsmAnd__IQueryController queryController) {
+    return OsmAndCoreJNI.IMapKeyedDataProvider_obtainData__SWIG_0(swigCPtr, this, SWIGTYPE_p_void.getCPtr(key), MapKeyedData.getCPtr(outKeyedData), outKeyedData, SWIGTYPE_p_OsmAnd__IQueryController.getCPtr(queryController));
+  }
+
+  public boolean obtainData(SWIGTYPE_p_void key, MapKeyedData outKeyedData) {
+    return OsmAndCoreJNI.IMapKeyedDataProvider_obtainData__SWIG_1(swigCPtr, this, SWIGTYPE_p_void.getCPtr(key), MapKeyedData.getCPtr(outKeyedData), outKeyedData);
+  }
+
+}

JNI/src/net/osmand/core/jni/IMapKeyedSymbolsProvider.java

@@ -0,0 +1,40 @@
+/* ----------------------------------------------------------------------------
+ * 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 IMapKeyedSymbolsProvider extends IMapKeyedDataProvider {
+  private long swigCPtr;
+  private boolean swigCMemOwnDerived;
+
+  protected IMapKeyedSymbolsProvider(long cPtr, boolean cMemoryOwn) {
+    super(OsmAndCoreJNI.IMapKeyedSymbolsProvider_SWIGSmartPtrUpcast(cPtr), true);
+    swigCMemOwnDerived = cMemoryOwn;
+    swigCPtr = cPtr;
+  }
+
+  protected static long getCPtr(IMapKeyedSymbolsProvider obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+
+  protected void finalize() {
+    delete();
+  }
+
+  public synchronized void delete() {
+    if (swigCPtr != 0) {
+      if (swigCMemOwnDerived) {
+        swigCMemOwnDerived = false;
+        OsmAndCoreJNI.delete_IMapKeyedSymbolsProvider(swigCPtr);
+      }
+      swigCPtr = 0;
+    }
+    super.delete();
+  }
+
+}

JNI/src/net/osmand/core/jni/IMapRasterBitmapTileProvider.java

@@ -0,0 +1,48 @@
+/* ----------------------------------------------------------------------------
+ * 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 IMapRasterBitmapTileProvider extends IMapTiledDataProvider {
+  private long swigCPtr;
+  private boolean swigCMemOwnDerived;
+
+  protected IMapRasterBitmapTileProvider(long cPtr, boolean cMemoryOwn) {
+    super(OsmAndCoreJNI.IMapRasterBitmapTileProvider_SWIGSmartPtrUpcast(cPtr), true);
+    swigCMemOwnDerived = cMemoryOwn;
+    swigCPtr = cPtr;
+  }
+
+  protected static long getCPtr(IMapRasterBitmapTileProvider obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+
+  protected void finalize() {
+    delete();
+  }
+
+  public synchronized void delete() {
+    if (swigCPtr != 0) {
+      if (swigCMemOwnDerived) {
+        swigCMemOwnDerived = false;
+        OsmAndCoreJNI.delete_IMapRasterBitmapTileProvider(swigCPtr);
+      }
+      swigCPtr = 0;
+    }
+    super.delete();
+  }
+
+  public long getTileSize() {
+    return OsmAndCoreJNI.IMapRasterBitmapTileProvider_getTileSize(swigCPtr, this);
+  }
+
+  public float getTileDensityFactor() {
+    return OsmAndCoreJNI.IMapRasterBitmapTileProvider_getTileDensityFactor(swigCPtr, this);
+  }
+
+}

JNI/src/net/osmand/core/jni/IMapRenderer.java

@@ -0,0 +1,522 @@
+/* ----------------------------------------------------------------------------
+ * 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 IMapRenderer {
+  private long swigCPtr;
+  private boolean swigCMemOwn;
+
+  protected IMapRenderer(long cPtr, boolean cMemoryOwn) {
+    swigCMemOwn = cMemoryOwn;
+    swigCPtr = cPtr;
+  }
+
+  protected static long getCPtr(IMapRenderer obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+
+  protected void finalize() {
+    delete();
+  }
+
+  public synchronized void delete() {
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        OsmAndCoreJNI.delete_IMapRenderer(swigCPtr);
+      }
+      swigCPtr = 0;
+    }
+  }
+
+  public MapRendererSetupOptions getSetupOptions() {
+    return new MapRendererSetupOptions(OsmAndCoreJNI.IMapRenderer_getSetupOptions(swigCPtr, this), true);
+  }
+
+  public boolean setup(MapRendererSetupOptions setupOptions) {
+    return OsmAndCoreJNI.IMapRenderer_setup(swigCPtr, this, MapRendererSetupOptions.getCPtr(setupOptions), setupOptions);
+  }
+
+  public MapRendererConfiguration getConfiguration() {
+    long cPtr = OsmAndCoreJNI.IMapRenderer_getConfiguration(swigCPtr, this);
+    return (cPtr == 0) ? null : new MapRendererConfiguration(cPtr, true);
+  }
+
+  public void setConfiguration(MapRendererConfiguration configuration, boolean forcedUpdate) {
+    OsmAndCoreJNI.IMapRenderer_setConfiguration__SWIG_0(swigCPtr, this, MapRendererConfiguration.getCPtr(configuration), configuration, forcedUpdate);
+  }
+
+  public void setConfiguration(MapRendererConfiguration configuration) {
+    OsmAndCoreJNI.IMapRenderer_setConfiguration__SWIG_1(swigCPtr, this, MapRendererConfiguration.getCPtr(configuration), configuration);
+  }
+
+  public boolean isRenderingInitialized() {
+    return OsmAndCoreJNI.IMapRenderer_isRenderingInitialized(swigCPtr, this);
+  }
+
+  public boolean initializeRendering() {
+    return OsmAndCoreJNI.IMapRenderer_initializeRendering(swigCPtr, this);
+  }
+
+  public boolean update() {
+    return OsmAndCoreJNI.IMapRenderer_update(swigCPtr, this);
+  }
+
+  public boolean prepareFrame() {
+    return OsmAndCoreJNI.IMapRenderer_prepareFrame(swigCPtr, this);
+  }
+
+  public boolean renderFrame() {
+    return OsmAndCoreJNI.IMapRenderer_renderFrame(swigCPtr, this);
+  }
+
+  public boolean releaseRendering() {
+    return OsmAndCoreJNI.IMapRenderer_releaseRendering(swigCPtr, this);
+  }
+
+  public boolean isIdle() {
+    return OsmAndCoreJNI.IMapRenderer_isIdle(swigCPtr, this);
+  }
+
+  public String getNotIdleReason() {
+    return OsmAndCoreJNI.IMapRenderer_getNotIdleReason(swigCPtr, this);
+  }
+
+  public boolean pauseGpuWorkerThread() {
+    return OsmAndCoreJNI.IMapRenderer_pauseGpuWorkerThread(swigCPtr, this);
+  }
+
+  public boolean resumeGpuWorkerThread() {
+    return OsmAndCoreJNI.IMapRenderer_resumeGpuWorkerThread(swigCPtr, this);
+  }
+
+  static public class IFramePreparedObserver {
+    private long swigCPtr;
+    protected boolean swigCMemOwn;
+  
+    protected IFramePreparedObserver(long cPtr, boolean cMemoryOwn) {
+      swigCMemOwn = cMemoryOwn;
+      swigCPtr = cPtr;
+    }
+  
+    protected static long getCPtr(IFramePreparedObserver obj) {
+      return (obj == null) ? 0 : obj.swigCPtr;
+    }
+  
+    protected void finalize() {
+      delete();
+    }
+  
+    public synchronized void delete() {
+      if (swigCPtr != 0) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          OsmAndCoreJNI.delete_IMapRenderer_IFramePreparedObserver(swigCPtr);
+        }
+        swigCPtr = 0;
+      }
+    }
+  
+    protected void swigDirectorDisconnect() {
+      swigCMemOwn = false;
+      delete();
+    }
+  
+    public void swigReleaseOwnership() {
+      swigCMemOwn = false;
+      OsmAndCoreJNI.IMapRenderer_IFramePreparedObserver_change_ownership(this, swigCPtr, false);
+    }
+  
+    public void swigTakeOwnership() {
+      swigCMemOwn = true;
+      OsmAndCoreJNI.IMapRenderer_IFramePreparedObserver_change_ownership(this, swigCPtr, true);
+    }
+  
+    public IFramePreparedObserver() {
+      this(OsmAndCoreJNI.new_IMapRenderer_IFramePreparedObserver(), true);
+      OsmAndCoreJNI.IMapRenderer_IFramePreparedObserver_director_connect(this, swigCPtr, swigCMemOwn, true);
+    }
+  
+    public void method(IMapRenderer mapRenderer) {
+      OsmAndCoreJNI.IMapRenderer_IFramePreparedObserver_method(swigCPtr, this, IMapRenderer.getCPtr(mapRenderer), mapRenderer);
+    }
+  
+    public boolean attachTo(SWIGTYPE_p_OsmAnd__ObservableAsT_OsmAnd__IMapRenderer__IFramePreparedObserver_t observable, SWIGTYPE_p_OsmAnd__ObservableAsT_OsmAnd__IMapRenderer__IFramePreparedObserver_t__Tag tag) {
+      return OsmAndCoreJNI.IMapRenderer_IFramePreparedObserver_attachTo(swigCPtr, this, SWIGTYPE_p_OsmAnd__ObservableAsT_OsmAnd__IMapRenderer__IFramePreparedObserver_t.getCPtr(observable), SWIGTYPE_p_OsmAnd__ObservableAsT_OsmAnd__IMapRenderer__IFramePreparedObserver_t__Tag.getCPtr(tag));
+    }
+  
+    public SWIGTYPE_p_OsmAnd__IMapRenderer__FramePreparedObserver getBinding() {
+      return new SWIGTYPE_p_OsmAnd__IMapRenderer__FramePreparedObserver(OsmAndCoreJNI.IMapRenderer_IFramePreparedObserver_getBinding(swigCPtr, this), true);
+    }
+  
+  }
+
+  public SWIGTYPE_p_OsmAnd__ObservableAsT_OsmAnd__IMapRenderer__FramePreparedObserver_t getFramePreparedObservable() {
+    long cPtr = OsmAndCoreJNI.IMapRenderer_framePreparedObservable_get(swigCPtr, this);
+    return (cPtr == 0) ? null : new SWIGTYPE_p_OsmAnd__ObservableAsT_OsmAnd__IMapRenderer__FramePreparedObserver_t(cPtr, false);
+  }
+
+  public void reloadEverything() {
+    OsmAndCoreJNI.IMapRenderer_reloadEverything(swigCPtr, this);
+  }
+
+  public MapRendererState getState() {
+    return new MapRendererState(OsmAndCoreJNI.IMapRenderer_getState(swigCPtr, this), true);
+  }
+
+  public boolean isFrameInvalidated() {
+    return OsmAndCoreJNI.IMapRenderer_isFrameInvalidated(swigCPtr, this);
+  }
+
+  public void forcedFrameInvalidate() {
+    OsmAndCoreJNI.IMapRenderer_forcedFrameInvalidate(swigCPtr, this);
+  }
+
+  public void forcedGpuProcessingCycle() {
+    OsmAndCoreJNI.IMapRenderer_forcedGpuProcessingCycle(swigCPtr, this);
+  }
+
+  public long getSymbolsCount() {
+    return OsmAndCoreJNI.IMapRenderer_getSymbolsCount(swigCPtr, this);
+  }
+
+  public SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__MapSymbol_const_t_t getSymbolsAt(PointI screenPoint) {
+    return new SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__MapSymbol_const_t_t(OsmAndCoreJNI.IMapRenderer_getSymbolsAt(swigCPtr, this, PointI.getCPtr(screenPoint), screenPoint), true);
+  }
+
+  public void setRasterLayerProvider(RasterMapLayerId layerId, IMapRasterBitmapTileProvider tileProvider, boolean forcedUpdate) {
+    OsmAndCoreJNI.IMapRenderer_setRasterLayerProvider__SWIG_0(swigCPtr, this, layerId.swigValue(), IMapRasterBitmapTileProvider.getCPtr(tileProvider), tileProvider, forcedUpdate);
+  }
+
+  public void setRasterLayerProvider(RasterMapLayerId layerId, IMapRasterBitmapTileProvider tileProvider) {
+    OsmAndCoreJNI.IMapRenderer_setRasterLayerProvider__SWIG_1(swigCPtr, this, layerId.swigValue(), IMapRasterBitmapTileProvider.getCPtr(tileProvider), tileProvider);
+  }
+
+  public void resetRasterLayerProvider(RasterMapLayerId layerId, boolean forcedUpdate) {
+    OsmAndCoreJNI.IMapRenderer_resetRasterLayerProvider__SWIG_0(swigCPtr, this, layerId.swigValue(), forcedUpdate);
+  }
+
+  public void resetRasterLayerProvider(RasterMapLayerId layerId) {
+    OsmAndCoreJNI.IMapRenderer_resetRasterLayerProvider__SWIG_1(swigCPtr, this, layerId.swigValue());
+  }
+
+  public void setRasterLayerOpacity(RasterMapLayerId layerId, float opacity, boolean forcedUpdate) {
+    OsmAndCoreJNI.IMapRenderer_setRasterLayerOpacity__SWIG_0(swigCPtr, this, layerId.swigValue(), opacity, forcedUpdate);
+  }
+
+  public void setRasterLayerOpacity(RasterMapLayerId layerId, float opacity) {
+    OsmAndCoreJNI.IMapRenderer_setRasterLayerOpacity__SWIG_1(swigCPtr, this, layerId.swigValue(), opacity);
+  }
+
+  public void setElevationDataProvider(IMapElevationDataProvider tileProvider, boolean forcedUpdate) {
+    OsmAndCoreJNI.IMapRenderer_setElevationDataProvider__SWIG_0(swigCPtr, this, IMapElevationDataProvider.getCPtr(tileProvider), tileProvider, forcedUpdate);
+  }
+
+  public void setElevationDataProvider(IMapElevationDataProvider tileProvider) {
+    OsmAndCoreJNI.IMapRenderer_setElevationDataProvider__SWIG_1(swigCPtr, this, IMapElevationDataProvider.getCPtr(tileProvider), tileProvider);
+  }
+
+  public void resetElevationDataProvider(boolean forcedUpdate) {
+    OsmAndCoreJNI.IMapRenderer_resetElevationDataProvider__SWIG_0(swigCPtr, this, forcedUpdate);
+  }
+
+  public void resetElevationDataProvider() {
+    OsmAndCoreJNI.IMapRenderer_resetElevationDataProvider__SWIG_1(swigCPtr, this);
+  }
+
+  public void setElevationDataScaleFactor(float factor, boolean forcedUpdate) {
+    OsmAndCoreJNI.IMapRenderer_setElevationDataScaleFactor__SWIG_0(swigCPtr, this, factor, forcedUpdate);
+  }
+
+  public void setElevationDataScaleFactor(float factor) {
+    OsmAndCoreJNI.IMapRenderer_setElevationDataScaleFactor__SWIG_1(swigCPtr, this, factor);
+  }
+
+  public void addSymbolProvider(IMapDataProvider provider, boolean forcedUpdate) {
+    OsmAndCoreJNI.IMapRenderer_addSymbolProvider__SWIG_0(swigCPtr, this, IMapDataProvider.getCPtr(provider), provider, forcedUpdate);
+  }
+
+  public void addSymbolProvider(IMapDataProvider provider) {
+    OsmAndCoreJNI.IMapRenderer_addSymbolProvider__SWIG_1(swigCPtr, this, IMapDataProvider.getCPtr(provider), provider);
+  }
+
+  public void removeSymbolProvider(IMapDataProvider provider, boolean forcedUpdate) {
+    OsmAndCoreJNI.IMapRenderer_removeSymbolProvider__SWIG_0(swigCPtr, this, IMapDataProvider.getCPtr(provider), provider, forcedUpdate);
+  }
+
+  public void removeSymbolProvider(IMapDataProvider provider) {
+    OsmAndCoreJNI.IMapRenderer_removeSymbolProvider__SWIG_1(swigCPtr, this, IMapDataProvider.getCPtr(provider), provider);
+  }
+
+  public void removeAllSymbolProviders(boolean forcedUpdate) {
+    OsmAndCoreJNI.IMapRenderer_removeAllSymbolProviders__SWIG_0(swigCPtr, this, forcedUpdate);
+  }
+
+  public void removeAllSymbolProviders() {
+    OsmAndCoreJNI.IMapRenderer_removeAllSymbolProviders__SWIG_1(swigCPtr, this);
+  }
+
+  public void setWindowSize(PointI windowSize, boolean forcedUpdate) {
+    OsmAndCoreJNI.IMapRenderer_setWindowSize__SWIG_0(swigCPtr, this, PointI.getCPtr(windowSize), windowSize, forcedUpdate);
+  }
+
+  public void setWindowSize(PointI windowSize) {
+    OsmAndCoreJNI.IMapRenderer_setWindowSize__SWIG_1(swigCPtr, this, PointI.getCPtr(windowSize), windowSize);
+  }
+
+  public void setViewport(AreaI viewport, boolean forcedUpdate) {
+    OsmAndCoreJNI.IMapRenderer_setViewport__SWIG_0(swigCPtr, this, AreaI.getCPtr(viewport), viewport, forcedUpdate);
+  }
+
+  public void setViewport(AreaI viewport) {
+    OsmAndCoreJNI.IMapRenderer_setViewport__SWIG_1(swigCPtr, this, AreaI.getCPtr(viewport), viewport);
+  }
+
+  public void setFieldOfView(float fieldOfView, boolean forcedUpdate) {
+    OsmAndCoreJNI.IMapRenderer_setFieldOfView__SWIG_0(swigCPtr, this, fieldOfView, forcedUpdate);
+  }
+
+  public void setFieldOfView(float fieldOfView) {
+    OsmAndCoreJNI.IMapRenderer_setFieldOfView__SWIG_1(swigCPtr, this, fieldOfView);
+  }
+
+  public void setDistanceToFog(float fogDistance, boolean forcedUpdate) {
+    OsmAndCoreJNI.IMapRenderer_setDistanceToFog__SWIG_0(swigCPtr, this, fogDistance, forcedUpdate);
+  }
+
+  public void setDistanceToFog(float fogDistance) {
+    OsmAndCoreJNI.IMapRenderer_setDistanceToFog__SWIG_1(swigCPtr, this, fogDistance);
+  }
+
+  public void setFogOriginFactor(float factor, boolean forcedUpdate) {
+    OsmAndCoreJNI.IMapRenderer_setFogOriginFactor__SWIG_0(swigCPtr, this, factor, forcedUpdate);
+  }
+
+  public void setFogOriginFactor(float factor) {
+    OsmAndCoreJNI.IMapRenderer_setFogOriginFactor__SWIG_1(swigCPtr, this, factor);
+  }
+
+  public void setFogHeightOriginFactor(float factor, boolean forcedUpdate) {
+    OsmAndCoreJNI.IMapRenderer_setFogHeightOriginFactor__SWIG_0(swigCPtr, this, factor, forcedUpdate);
+  }
+
+  public void setFogHeightOriginFactor(float factor) {
+    OsmAndCoreJNI.IMapRenderer_setFogHeightOriginFactor__SWIG_1(swigCPtr, this, factor);
+  }
+
+  public void setFogDensity(float fogDensity, boolean forcedUpdate) {
+    OsmAndCoreJNI.IMapRenderer_setFogDensity__SWIG_0(swigCPtr, this, fogDensity, forcedUpdate);
+  }
+
+  public void setFogDensity(float fogDensity) {
+    OsmAndCoreJNI.IMapRenderer_setFogDensity__SWIG_1(swigCPtr, this, fogDensity);
+  }
+
+  public void setFogColor(FColorRGB color, boolean forcedUpdate) {
+    OsmAndCoreJNI.IMapRenderer_setFogColor__SWIG_0(swigCPtr, this, FColorRGB.getCPtr(color), color, forcedUpdate);
+  }
+
+  public void setFogColor(FColorRGB color) {
+    OsmAndCoreJNI.IMapRenderer_setFogColor__SWIG_1(swigCPtr, this, FColorRGB.getCPtr(color), color);
+  }
+
+  public void setSkyColor(FColorRGB color, boolean forcedUpdate) {
+    OsmAndCoreJNI.IMapRenderer_setSkyColor__SWIG_0(swigCPtr, this, FColorRGB.getCPtr(color), color, forcedUpdate);
+  }
+
+  public void setSkyColor(FColorRGB color) {
+    OsmAndCoreJNI.IMapRenderer_setSkyColor__SWIG_1(swigCPtr, this, FColorRGB.getCPtr(color), color);
+  }
+
+  public void setAzimuth(float azimuth, boolean forcedUpdate) {
+    OsmAndCoreJNI.IMapRenderer_setAzimuth__SWIG_0(swigCPtr, this, azimuth, forcedUpdate);
+  }
+
+  public void setAzimuth(float azimuth) {
+    OsmAndCoreJNI.IMapRenderer_setAzimuth__SWIG_1(swigCPtr, this, azimuth);
+  }
+
+  public void setElevationAngle(float elevationAngle, boolean forcedUpdate) {
+    OsmAndCoreJNI.IMapRenderer_setElevationAngle__SWIG_0(swigCPtr, this, elevationAngle, forcedUpdate);
+  }
+
+  public void setElevationAngle(float elevationAngle) {
+    OsmAndCoreJNI.IMapRenderer_setElevationAngle__SWIG_1(swigCPtr, this, elevationAngle);
+  }
+
+  public void setTarget(PointI target31, boolean forcedUpdate) {
+    OsmAndCoreJNI.IMapRenderer_setTarget__SWIG_0(swigCPtr, this, PointI.getCPtr(target31), target31, forcedUpdate);
+  }
+
+  public void setTarget(PointI target31) {
+    OsmAndCoreJNI.IMapRenderer_setTarget__SWIG_1(swigCPtr, this, PointI.getCPtr(target31), target31);
+  }
+
+  public void setZoom(float zoom, boolean forcedUpdate) {
+    OsmAndCoreJNI.IMapRenderer_setZoom__SWIG_0(swigCPtr, this, zoom, forcedUpdate);
+  }
+
+  public void setZoom(float zoom) {
+    OsmAndCoreJNI.IMapRenderer_setZoom__SWIG_1(swigCPtr, this, zoom);
+  }
+
+  public MapRendererDebugSettings getDebugSettings() {
+    long cPtr = OsmAndCoreJNI.IMapRenderer_getDebugSettings(swigCPtr, this);
+    return (cPtr == 0) ? null : new MapRendererDebugSettings(cPtr, true);
+  }
+
+  public void setDebugSettings(MapRendererDebugSettings debugSettings) {
+    OsmAndCoreJNI.IMapRenderer_setDebugSettings(swigCPtr, this, MapRendererDebugSettings.getCPtr(debugSettings), debugSettings);
+  }
+
+  public float getMinZoom() {
+    return OsmAndCoreJNI.IMapRenderer_getMinZoom(swigCPtr, this);
+  }
+
+  public float getMaxZoom() {
+    return OsmAndCoreJNI.IMapRenderer_getMaxZoom(swigCPtr, this);
+  }
+
+  public float getRecommendedMinZoom(IMapRenderer.ZoomRecommendationStrategy strategy) {
+    return OsmAndCoreJNI.IMapRenderer_getRecommendedMinZoom__SWIG_0(swigCPtr, this, strategy.swigValue());
+  }
+
+  public float getRecommendedMinZoom() {
+    return OsmAndCoreJNI.IMapRenderer_getRecommendedMinZoom__SWIG_1(swigCPtr, this);
+  }
+
+  public float getRecommendedMaxZoom(IMapRenderer.ZoomRecommendationStrategy strategy) {
+    return OsmAndCoreJNI.IMapRenderer_getRecommendedMaxZoom__SWIG_0(swigCPtr, this, strategy.swigValue());
+  }
+
+  public float getRecommendedMaxZoom() {
+    return OsmAndCoreJNI.IMapRenderer_getRecommendedMaxZoom__SWIG_1(swigCPtr, this);
+  }
+
+  static public class IStateChangeObserver {
+    private long swigCPtr;
+    protected boolean swigCMemOwn;
+  
+    protected IStateChangeObserver(long cPtr, boolean cMemoryOwn) {
+      swigCMemOwn = cMemoryOwn;
+      swigCPtr = cPtr;
+    }
+  
+    protected static long getCPtr(IStateChangeObserver obj) {
+      return (obj == null) ? 0 : obj.swigCPtr;
+    }
+  
+    protected void finalize() {
+      delete();
+    }
+  
+    public synchronized void delete() {
+      if (swigCPtr != 0) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          OsmAndCoreJNI.delete_IMapRenderer_IStateChangeObserver(swigCPtr);
+        }
+        swigCPtr = 0;
+      }
+    }
+  
+    protected void swigDirectorDisconnect() {
+      swigCMemOwn = false;
+      delete();
+    }
+  
+    public void swigReleaseOwnership() {
+      swigCMemOwn = false;
+      OsmAndCoreJNI.IMapRenderer_IStateChangeObserver_change_ownership(this, swigCPtr, false);
+    }
+  
+    public void swigTakeOwnership() {
+      swigCMemOwn = true;
+      OsmAndCoreJNI.IMapRenderer_IStateChangeObserver_change_ownership(this, swigCPtr, true);
+    }
+  
+    public IStateChangeObserver() {
+      this(OsmAndCoreJNI.new_IMapRenderer_IStateChangeObserver(), true);
+      OsmAndCoreJNI.IMapRenderer_IStateChangeObserver_director_connect(this, swigCPtr, swigCMemOwn, true);
+    }
+  
+    public void method(IMapRenderer mapRenderer, MapRendererStateChange thisChange, MapRendererStateChanges allChanges) {
+      OsmAndCoreJNI.IMapRenderer_IStateChangeObserver_method(swigCPtr, this, IMapRenderer.getCPtr(mapRenderer), mapRenderer, thisChange.swigValue(), MapRendererStateChanges.getCPtr(allChanges), allChanges);
+    }
+  
+    public boolean attachTo(SWIGTYPE_p_OsmAnd__ObservableAsT_OsmAnd__IMapRenderer__IStateChangeObserver_t observable, SWIGTYPE_p_OsmAnd__ObservableAsT_OsmAnd__IMapRenderer__IStateChangeObserver_t__Tag tag) {
+      return OsmAndCoreJNI.IMapRenderer_IStateChangeObserver_attachTo(swigCPtr, this, SWIGTYPE_p_OsmAnd__ObservableAsT_OsmAnd__IMapRenderer__IStateChangeObserver_t.getCPtr(observable), SWIGTYPE_p_OsmAnd__ObservableAsT_OsmAnd__IMapRenderer__IStateChangeObserver_t__Tag.getCPtr(tag));
+    }
+  
+    public SWIGTYPE_p_OsmAnd__IMapRenderer__StateChangeObserver getBinding() {
+      return new SWIGTYPE_p_OsmAnd__IMapRenderer__StateChangeObserver(OsmAndCoreJNI.IMapRenderer_IStateChangeObserver_getBinding(swigCPtr, this), true);
+    }
+  
+  }
+
+  public SWIGTYPE_p_OsmAnd__ObservableAsT_OsmAnd__IMapRenderer__StateChangeObserver_t getStateChangeObservable() {
+    long cPtr = OsmAndCoreJNI.IMapRenderer_stateChangeObservable_get(swigCPtr, this);
+    return (cPtr == 0) ? null : new SWIGTYPE_p_OsmAnd__ObservableAsT_OsmAnd__IMapRenderer__StateChangeObserver_t(cPtr, false);
+  }
+
+  public boolean getLocationFromScreenPoint(PointI screenPoint, PointI location31) {
+    return OsmAndCoreJNI.IMapRenderer_getLocationFromScreenPoint__SWIG_0(swigCPtr, this, PointI.getCPtr(screenPoint), screenPoint, PointI.getCPtr(location31), location31);
+  }
+
+  public boolean getLocationFromScreenPoint(PointI screenPoint, SWIGTYPE_p_OsmAnd__PointT_long_long_t location) {
+    return OsmAndCoreJNI.IMapRenderer_getLocationFromScreenPoint__SWIG_1(swigCPtr, this, PointI.getCPtr(screenPoint), screenPoint, SWIGTYPE_p_OsmAnd__PointT_long_long_t.getCPtr(location));
+  }
+
+  public void dumpResourcesInfo() {
+    OsmAndCoreJNI.IMapRenderer_dumpResourcesInfo(swigCPtr, this);
+  }
+
+  public enum ZoomRecommendationStrategy {
+    NarrowestRange,
+    WidestRange;
+
+    public final int swigValue() {
+      return swigValue;
+    }
+
+    public static ZoomRecommendationStrategy swigToEnum(int swigValue) {
+      ZoomRecommendationStrategy[] swigValues = ZoomRecommendationStrategy.class.getEnumConstants();
+      if (swigValue < swigValues.length && swigValue >= 0 && swigValues[swigValue].swigValue == swigValue)
+        return swigValues[swigValue];
+      for (ZoomRecommendationStrategy swigEnum : swigValues)
+        if (swigEnum.swigValue == swigValue)
+          return swigEnum;
+      throw new IllegalArgumentException("No enum " + ZoomRecommendationStrategy.class + " with value " + swigValue);
+    }
+
+    @SuppressWarnings("unused")
+    private ZoomRecommendationStrategy() {
+      this.swigValue = SwigNext.next++;
+    }
+
+    @SuppressWarnings("unused")
+    private ZoomRecommendationStrategy(int swigValue) {
+      this.swigValue = swigValue;
+      SwigNext.next = swigValue+1;
+    }
+
+    @SuppressWarnings("unused")
+    private ZoomRecommendationStrategy(ZoomRecommendationStrategy swigEnum) {
+      this.swigValue = swigEnum.swigValue;
+      SwigNext.next = this.swigValue+1;
+    }
+
+    private final int swigValue;
+
+    private static class SwigNext {
+      private static int next = 0;
+    }
+  }
+
+}

JNI/src/net/osmand/core/jni/IMapStylesCollection.java

@@ -0,0 +1,51 @@
+/* ----------------------------------------------------------------------------
+ * 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 IMapStylesCollection {
+  private long swigCPtr;
+  private boolean swigCMemOwn;
+
+  protected IMapStylesCollection(long cPtr, boolean cMemoryOwn) {
+    swigCMemOwn = cMemoryOwn;
+    swigCPtr = cPtr;
+  }
+
+  protected static long getCPtr(IMapStylesCollection obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+
+  protected void finalize() {
+    delete();
+  }
+
+  public synchronized void delete() {
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        OsmAndCoreJNI.delete_IMapStylesCollection(swigCPtr);
+      }
+      swigCPtr = 0;
+    }
+  }
+
+  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 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 ResolvedMapStyle getResolvedStyleByName(String name) {
+    long cPtr = OsmAndCoreJNI.IMapStylesCollection_getResolvedStyleByName(swigCPtr, this, name);
+    return (cPtr == 0) ? null : new ResolvedMapStyle(cPtr, true);
+  }
+
+}

JNI/src/net/osmand/core/jni/IMapStylesPresetsCollection.java

@@ -0,0 +1,51 @@
+/* ----------------------------------------------------------------------------
+ * 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 IMapStylesPresetsCollection {
+  private long swigCPtr;
+  private boolean swigCMemOwn;
+
+  protected IMapStylesPresetsCollection(long cPtr, boolean cMemoryOwn) {
+    swigCMemOwn = cMemoryOwn;
+    swigCPtr = cPtr;
+  }
+
+  protected static long getCPtr(IMapStylesPresetsCollection obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+
+  protected void finalize() {
+    delete();
+  }
+
+  public synchronized void delete() {
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        OsmAndCoreJNI.delete_IMapStylesPresetsCollection(swigCPtr);
+      }
+      swigCPtr = 0;
+    }
+  }
+
+  public SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__MapStylePreset_const_t_t getCollection() {
+    return new SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__MapStylePreset_const_t_t(OsmAndCoreJNI.IMapStylesPresetsCollection_getCollection(swigCPtr, this), true);
+  }
+
+  public SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__MapStylePreset_const_t_t getCollectionFor(String styleName) {
+    return new SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__MapStylePreset_const_t_t(OsmAndCoreJNI.IMapStylesPresetsCollection_getCollectionFor(swigCPtr, this, styleName), true);
+  }
+
+  public MapStylePreset getPreset(String styleName, String presetName) {
+    long cPtr = OsmAndCoreJNI.IMapStylesPresetsCollection_getPreset(swigCPtr, this, styleName, presetName);
+    return (cPtr == 0) ? null : new MapStylePreset(cPtr, true);
+  }
+
+}

JNI/src/net/osmand/core/jni/IMapTiledDataProvider.java

@@ -0,0 +1,56 @@
+/* ----------------------------------------------------------------------------
+ * 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 IMapTiledDataProvider extends IMapDataProvider {
+  private long swigCPtr;
+  private boolean swigCMemOwnDerived;
+
+  protected IMapTiledDataProvider(long cPtr, boolean cMemoryOwn) {
+    super(OsmAndCoreJNI.IMapTiledDataProvider_SWIGSmartPtrUpcast(cPtr), true);
+    swigCMemOwnDerived = cMemoryOwn;
+    swigCPtr = cPtr;
+  }
+
+  protected static long getCPtr(IMapTiledDataProvider obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+
+  protected void finalize() {
+    delete();
+  }
+
+  public synchronized void delete() {
+    if (swigCPtr != 0) {
+      if (swigCMemOwnDerived) {
+        swigCMemOwnDerived = false;
+        OsmAndCoreJNI.delete_IMapTiledDataProvider(swigCPtr);
+      }
+      swigCPtr = 0;
+    }
+    super.delete();
+  }
+
+  public ZoomLevel getMinZoom() {
+    return ZoomLevel.swigToEnum(OsmAndCoreJNI.IMapTiledDataProvider_getMinZoom(swigCPtr, this));
+  }
+
+  public ZoomLevel getMaxZoom() {
+    return ZoomLevel.swigToEnum(OsmAndCoreJNI.IMapTiledDataProvider_getMaxZoom(swigCPtr, this));
+  }
+
+  public boolean obtainData(TileId tileId, ZoomLevel zoom, MapTiledData outTiledData, SWIGTYPE_p_OsmAnd__IQueryController queryController) {
+    return OsmAndCoreJNI.IMapTiledDataProvider_obtainData__SWIG_0(swigCPtr, this, TileId.getCPtr(tileId), tileId, zoom.swigValue(), MapTiledData.getCPtr(outTiledData), outTiledData, SWIGTYPE_p_OsmAnd__IQueryController.getCPtr(queryController));
+  }
+
+  public boolean obtainData(TileId tileId, ZoomLevel zoom, MapTiledData outTiledData) {
+    return OsmAndCoreJNI.IMapTiledDataProvider_obtainData__SWIG_1(swigCPtr, this, TileId.getCPtr(tileId), tileId, zoom.swigValue(), MapTiledData.getCPtr(outTiledData), outTiledData);
+  }
+
+}

JNI/src/net/osmand/core/jni/IMapTiledSymbolsProvider.java

@@ -0,0 +1,48 @@
+/* ----------------------------------------------------------------------------
+ * 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 IMapTiledSymbolsProvider extends IMapTiledDataProvider {
+  private long swigCPtr;
+  private boolean swigCMemOwnDerived;
+
+  protected IMapTiledSymbolsProvider(long cPtr, boolean cMemoryOwn) {
+    super(OsmAndCoreJNI.IMapTiledSymbolsProvider_SWIGSmartPtrUpcast(cPtr), true);
+    swigCMemOwnDerived = cMemoryOwn;
+    swigCPtr = cPtr;
+  }
+
+  protected static long getCPtr(IMapTiledSymbolsProvider obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+
+  protected void finalize() {
+    delete();
+  }
+
+  public synchronized void delete() {
+    if (swigCPtr != 0) {
+      if (swigCMemOwnDerived) {
+        swigCMemOwnDerived = false;
+        OsmAndCoreJNI.delete_IMapTiledSymbolsProvider(swigCPtr);
+      }
+      swigCPtr = 0;
+    }
+    super.delete();
+  }
+
+  public boolean obtainData(TileId tileId, ZoomLevel zoom, MapTiledData outTiledData, SWIGTYPE_p_OsmAnd__IQueryController queryController) {
+    return OsmAndCoreJNI.IMapTiledSymbolsProvider_obtainData__SWIG_0(swigCPtr, this, TileId.getCPtr(tileId), tileId, zoom.swigValue(), MapTiledData.getCPtr(outTiledData), outTiledData, SWIGTYPE_p_OsmAnd__IQueryController.getCPtr(queryController));
+  }
+
+  public boolean obtainData(TileId tileId, ZoomLevel zoom, MapTiledData outTiledData) {
+    return OsmAndCoreJNI.IMapTiledSymbolsProvider_obtainData__SWIG_1(swigCPtr, this, TileId.getCPtr(tileId), tileId, zoom.swigValue(), MapTiledData.getCPtr(outTiledData), outTiledData);
+  }
+
+}

JNI/src/net/osmand/core/jni/IObfsCollection.java

@@ -0,0 +1,47 @@
+/* ----------------------------------------------------------------------------
+ * 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 IObfsCollection {
+  private long swigCPtr;
+  private boolean swigCMemOwn;
+
+  protected IObfsCollection(long cPtr, boolean cMemoryOwn) {
+    swigCMemOwn = cMemoryOwn;
+    swigCPtr = cPtr;
+  }
+
+  protected static long getCPtr(IObfsCollection obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+
+  protected void finalize() {
+    delete();
+  }
+
+  public synchronized void delete() {
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        OsmAndCoreJNI.delete_IObfsCollection(swigCPtr);
+      }
+      swigCPtr = 0;
+    }
+  }
+
+  public SWIGTYPE_p_QListT_std__shared_ptrT_ObfFile_const_t_t getObfFiles() {
+    return new SWIGTYPE_p_QListT_std__shared_ptrT_ObfFile_const_t_t(OsmAndCoreJNI.IObfsCollection_getObfFiles(swigCPtr, this), true);
+  }
+
+  public ObfDataInterface obtainDataInterface() {
+    long cPtr = OsmAndCoreJNI.IObfsCollection_obtainDataInterface(swigCPtr, this);
+    return (cPtr == 0) ? null : new ObfDataInterface(cPtr, true);
+  }
+
+}

JNI/src/net/osmand/core/jni/IObservable.java

@@ -0,0 +1,42 @@
+/* ----------------------------------------------------------------------------
+ * 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 IObservable {
+  private long swigCPtr;
+  protected boolean swigCMemOwn;
+
+  protected IObservable(long cPtr, boolean cMemoryOwn) {
+    swigCMemOwn = cMemoryOwn;
+    swigCPtr = cPtr;
+  }
+
+  protected static long getCPtr(IObservable obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+
+  protected void finalize() {
+    delete();
+  }
+
+  public synchronized void delete() {
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        OsmAndCoreJNI.delete_IObservable(swigCPtr);
+      }
+      swigCPtr = 0;
+    }
+  }
+
+  public IObservable() {
+    this(OsmAndCoreJNI.new_IObservable(), true);
+  }
+
+}

JNI/src/net/osmand/core/jni/IOnlineTileSources.java

@@ -0,0 +1,137 @@
+/* ----------------------------------------------------------------------------
+ * 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 IOnlineTileSources {
+  private long swigCPtr;
+  private boolean swigCMemOwn;
+
+  protected IOnlineTileSources(long cPtr, boolean cMemoryOwn) {
+    swigCMemOwn = cMemoryOwn;
+    swigCPtr = cPtr;
+  }
+
+  protected static long getCPtr(IOnlineTileSources obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+
+  protected void finalize() {
+    delete();
+  }
+
+  public synchronized void delete() {
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        OsmAndCoreJNI.delete_IOnlineTileSources(swigCPtr);
+      }
+      swigCPtr = 0;
+    }
+  }
+
+  static public class Source {
+    private long swigCPtr;
+    private boolean swigCMemOwn;
+  
+    protected Source(long cPtr, boolean cMemoryOwn) {
+      swigCMemOwn = cMemoryOwn;
+      swigCPtr = cPtr;
+    }
+  
+    protected static long getCPtr(Source obj) {
+      return (obj == null) ? 0 : obj.swigCPtr;
+    }
+  
+    protected void finalize() {
+      delete();
+    }
+  
+    public synchronized void delete() {
+      if (swigCPtr != 0) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          OsmAndCoreJNI.delete_IOnlineTileSources_Source(swigCPtr);
+        }
+        swigCPtr = 0;
+      }
+    }
+  
+    public Source(String name) {
+      this(OsmAndCoreJNI.new_IOnlineTileSources_Source(name), true);
+    }
+  
+    public String getName() {
+      return OsmAndCoreJNI.IOnlineTileSources_Source_name_get(swigCPtr, this);
+    }
+  
+    public void setUrlPattern(String value) {
+      OsmAndCoreJNI.IOnlineTileSources_Source_urlPattern_set(swigCPtr, this, value);
+    }
+  
+    public String getUrlPattern() {
+      return OsmAndCoreJNI.IOnlineTileSources_Source_urlPattern_get(swigCPtr, this);
+    }
+  
+    public void setMinZoom(ZoomLevel value) {
+      OsmAndCoreJNI.IOnlineTileSources_Source_minZoom_set(swigCPtr, this, value.swigValue());
+    }
+  
+    public ZoomLevel getMinZoom() {
+      return ZoomLevel.swigToEnum(OsmAndCoreJNI.IOnlineTileSources_Source_minZoom_get(swigCPtr, this));
+    }
+  
+    public void setMaxZoom(ZoomLevel value) {
+      OsmAndCoreJNI.IOnlineTileSources_Source_maxZoom_set(swigCPtr, this, value.swigValue());
+    }
+  
+    public ZoomLevel getMaxZoom() {
+      return ZoomLevel.swigToEnum(OsmAndCoreJNI.IOnlineTileSources_Source_maxZoom_get(swigCPtr, this));
+    }
+  
+    public void setMaxConcurrentDownloads(long value) {
+      OsmAndCoreJNI.IOnlineTileSources_Source_maxConcurrentDownloads_set(swigCPtr, this, value);
+    }
+  
+    public long getMaxConcurrentDownloads() {
+      return OsmAndCoreJNI.IOnlineTileSources_Source_maxConcurrentDownloads_get(swigCPtr, this);
+    }
+  
+    public void setTileSize(long value) {
+      OsmAndCoreJNI.IOnlineTileSources_Source_tileSize_set(swigCPtr, this, value);
+    }
+  
+    public long getTileSize() {
+      return OsmAndCoreJNI.IOnlineTileSources_Source_tileSize_get(swigCPtr, this);
+    }
+  
+    public void setAlphaChannelData(AlphaChannelData value) {
+      OsmAndCoreJNI.IOnlineTileSources_Source_alphaChannelData_set(swigCPtr, this, value.swigValue());
+    }
+  
+    public AlphaChannelData getAlphaChannelData() {
+      return AlphaChannelData.swigToEnum(OsmAndCoreJNI.IOnlineTileSources_Source_alphaChannelData_get(swigCPtr, this));
+    }
+  
+  }
+
+  public SWIGTYPE_p_QHashT_QString_std__shared_ptrT_OsmAnd__IOnlineTileSources__Source_const_t_t getCollection() {
+    return new SWIGTYPE_p_QHashT_QString_std__shared_ptrT_OsmAnd__IOnlineTileSources__Source_const_t_t(OsmAndCoreJNI.IOnlineTileSources_getCollection(swigCPtr, this), true);
+  }
+
+  public IOnlineTileSources.Source getSourceByName(String sourceName) {
+    long cPtr = OsmAndCoreJNI.IOnlineTileSources_getSourceByName(swigCPtr, this, sourceName);
+    return (cPtr == 0) ? null : new IOnlineTileSources.Source(cPtr, true);
+  }
+
+  public OnlineRasterMapTileProvider createProviderFor(String sourceName) {
+    long cPtr = OsmAndCoreJNI.IOnlineTileSources_createProviderFor(swigCPtr, this, sourceName);
+    return (cPtr == 0) ? null : new OnlineRasterMapTileProvider(cPtr, true);
+  }
+
+}

JNI/src/net/osmand/core/jni/IntPtr.java

@@ -0,0 +1,60 @@
+/* ----------------------------------------------------------------------------
+ * 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 IntPtr {
+  private long swigCPtr;
+  protected boolean swigCMemOwn;
+
+  protected IntPtr(long cPtr, boolean cMemoryOwn) {
+    swigCMemOwn = cMemoryOwn;
+    swigCPtr = cPtr;
+  }
+
+  protected static long getCPtr(IntPtr obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+
+  protected void finalize() {
+    delete();
+  }
+
+  public synchronized void delete() {
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        OsmAndCoreJNI.delete_IntPtr(swigCPtr);
+      }
+      swigCPtr = 0;
+    }
+  }
+
+  public IntPtr() {
+    this(OsmAndCoreJNI.new_IntPtr(), true);
+  }
+
+  public void assign(int value) {
+    OsmAndCoreJNI.IntPtr_assign(swigCPtr, this, value);
+  }
+
+  public int value() {
+    return OsmAndCoreJNI.IntPtr_value(swigCPtr, this);
+  }
+
+  public SWIGTYPE_p_int cast() {
+    long cPtr = OsmAndCoreJNI.IntPtr_cast(swigCPtr, this);
+    return (cPtr == 0) ? null : new SWIGTYPE_p_int(cPtr, false);
+  }
+
+  public static IntPtr frompointer(SWIGTYPE_p_int t) {
+    long cPtr = OsmAndCoreJNI.IntPtr_frompointer(SWIGTYPE_p_int.getCPtr(t));
+    return (cPtr == 0) ? null : new IntPtr(cPtr, false);
+  }
+
+}

JNI/src/net/osmand/core/jni/KeyedMapSymbolsData.java

@@ -0,0 +1,57 @@
+/* ----------------------------------------------------------------------------
+ * 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 KeyedMapSymbolsData extends MapKeyedData {
+  private long swigCPtr;
+  private boolean swigCMemOwnDerived;
+
+  protected KeyedMapSymbolsData(long cPtr, boolean cMemoryOwn) {
+    super(OsmAndCoreJNI.KeyedMapSymbolsData_SWIGSmartPtrUpcast(cPtr), true);
+    swigCMemOwnDerived = cMemoryOwn;
+    swigCPtr = cPtr;
+  }
+
+  protected static long getCPtr(KeyedMapSymbolsData obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+
+  protected void finalize() {
+    delete();
+  }
+
+  public synchronized void delete() {
+    if (swigCPtr != 0) {
+      if (swigCMemOwnDerived) {
+        swigCMemOwnDerived = false;
+        OsmAndCoreJNI.delete_KeyedMapSymbolsData(swigCPtr);
+      }
+      swigCPtr = 0;
+    }
+    super.delete();
+  }
+
+  public KeyedMapSymbolsData(MapSymbolsGroup symbolsGroup, SWIGTYPE_p_void key) {
+    this(OsmAndCoreJNI.new_KeyedMapSymbolsData(MapSymbolsGroup.getCPtr(symbolsGroup), symbolsGroup, SWIGTYPE_p_void.getCPtr(key)), true);
+  }
+
+  public void setSymbolsGroup(MapSymbolsGroup value) {
+    OsmAndCoreJNI.KeyedMapSymbolsData_symbolsGroup_set(swigCPtr, this, MapSymbolsGroup.getCPtr(value), value);
+  }
+
+  public MapSymbolsGroup getSymbolsGroup() {
+    long cPtr = OsmAndCoreJNI.KeyedMapSymbolsData_symbolsGroup_get(swigCPtr, this);
+    return (cPtr == 0) ? null : new MapSymbolsGroup(cPtr, true);
+  }
+
+  public void releaseConsumableContent() {
+    OsmAndCoreJNI.KeyedMapSymbolsData_releaseConsumableContent(swigCPtr, this);
+  }
+
+}

JNI/src/net/osmand/core/jni/LanguageId.java

@@ -0,0 +1,53 @@
+/* ----------------------------------------------------------------------------
+ * 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 LanguageId {
+  Invariant(OsmAndCoreJNI.LanguageId_Invariant_get()),
+  Localized,
+  Native;
+
+  public final int swigValue() {
+    return swigValue;
+  }
+
+  public static LanguageId swigToEnum(int swigValue) {
+    LanguageId[] swigValues = LanguageId.class.getEnumConstants();
+    if (swigValue < swigValues.length && swigValue >= 0 && swigValues[swigValue].swigValue == swigValue)
+      return swigValues[swigValue];
+    for (LanguageId swigEnum : swigValues)
+      if (swigEnum.swigValue == swigValue)
+        return swigEnum;
+    throw new IllegalArgumentException("No enum " + LanguageId.class + " with value " + swigValue);
+  }
+
+  @SuppressWarnings("unused")
+  private LanguageId() {
+    this.swigValue = SwigNext.next++;
+  }
+
+  @SuppressWarnings("unused")
+  private LanguageId(int swigValue) {
+    this.swigValue = swigValue;
+    SwigNext.next = swigValue+1;
+  }
+
+  @SuppressWarnings("unused")
+  private LanguageId(LanguageId swigEnum) {
+    this.swigValue = swigEnum.swigValue;
+    SwigNext.next = this.swigValue+1;
+  }
+
+  private final int swigValue;
+
+  private static class SwigNext {
+    private static int next = 0;
+  }
+}
+

JNI/src/net/osmand/core/jni/LatLon.java

@@ -0,0 +1,66 @@
+/* ----------------------------------------------------------------------------
+ * 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 LatLon {
+  private long swigCPtr;
+  protected boolean swigCMemOwn;
+
+  protected LatLon(long cPtr, boolean cMemoryOwn) {
+    swigCMemOwn = cMemoryOwn;
+    swigCPtr = cPtr;
+  }
+
+  protected static long getCPtr(LatLon obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+
+  protected void finalize() {
+    delete();
+  }
+
+  public synchronized void delete() {
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        OsmAndCoreJNI.delete_LatLon(swigCPtr);
+      }
+      swigCPtr = 0;
+    }
+  }
+
+  public void setLatitude(double value) {
+    OsmAndCoreJNI.LatLon_latitude_set(swigCPtr, this, value);
+  }
+
+  public double getLatitude() {
+    return OsmAndCoreJNI.LatLon_latitude_get(swigCPtr, this);
+  }
+
+  public void setLongitude(double value) {
+    OsmAndCoreJNI.LatLon_longitude_set(swigCPtr, this, value);
+  }
+
+  public double getLongitude() {
+    return OsmAndCoreJNI.LatLon_longitude_get(swigCPtr, this);
+  }
+
+  public LatLon() {
+    this(OsmAndCoreJNI.new_LatLon__SWIG_0(), true);
+  }
+
+  public LatLon(LatLon that) {
+    this(OsmAndCoreJNI.new_LatLon__SWIG_1(LatLon.getCPtr(that), that), true);
+  }
+
+  public LatLon(double latitude, double longitude) {
+    this(OsmAndCoreJNI.new_LatLon__SWIG_2(latitude, longitude), true);
+  }
+
+}

JNI/src/net/osmand/core/jni/LogSeverityLevel.java

@@ -0,0 +1,54 @@
+/* ----------------------------------------------------------------------------
+ * 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 LogSeverityLevel {
+  Error(OsmAndCoreJNI.LogSeverityLevel_Error_get()),
+  Warning,
+  Debug,
+  Info;
+
+  public final int swigValue() {
+    return swigValue;
+  }
+
+  public static LogSeverityLevel swigToEnum(int swigValue) {
+    LogSeverityLevel[] swigValues = LogSeverityLevel.class.getEnumConstants();
+    if (swigValue < swigValues.length && swigValue >= 0 && swigValues[swigValue].swigValue == swigValue)
+      return swigValues[swigValue];
+    for (LogSeverityLevel swigEnum : swigValues)
+      if (swigEnum.swigValue == swigValue)
+        return swigEnum;
+    throw new IllegalArgumentException("No enum " + LogSeverityLevel.class + " with value " + swigValue);
+  }
+
+  @SuppressWarnings("unused")
+  private LogSeverityLevel() {
+    this.swigValue = SwigNext.next++;
+  }
+
+  @SuppressWarnings("unused")
+  private LogSeverityLevel(int swigValue) {
+    this.swigValue = swigValue;
+    SwigNext.next = swigValue+1;
+  }
+
+  @SuppressWarnings("unused")
+  private LogSeverityLevel(LogSeverityLevel swigEnum) {
+    this.swigValue = swigEnum.swigValue;
+    SwigNext.next = this.swigValue+1;
+  }
+
+  private final int swigValue;
+
+  private static class SwigNext {
+    private static int next = 0;
+  }
+}
+

JNI/src/net/osmand/core/jni/Logger.java

@@ -0,0 +1,63 @@
+/* ----------------------------------------------------------------------------
+ * 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 Logger {
+  private long swigCPtr;
+  private boolean swigCMemOwn;
+
+  protected Logger(long cPtr, boolean cMemoryOwn) {
+    swigCMemOwn = cMemoryOwn;
+    swigCPtr = cPtr;
+  }
+
+  protected static long getCPtr(Logger obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+
+  protected void finalize() {
+    delete();
+  }
+
+  public synchronized void delete() {
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        OsmAndCoreJNI.delete_Logger(swigCPtr);
+      }
+      swigCPtr = 0;
+    }
+  }
+
+  public SWIGTYPE_p_QSetT_std__shared_ptrT_OsmAnd__ILogSink_t_t getCurrentLogSinks() {
+    return new SWIGTYPE_p_QSetT_std__shared_ptrT_OsmAnd__ILogSink_t_t(OsmAndCoreJNI.Logger_getCurrentLogSinks(swigCPtr, this), true);
+  }
+
+  public void addLogSink(ILogSink logSink) {
+    OsmAndCoreJNI.Logger_addLogSink(swigCPtr, this, ILogSink.getCPtr(logSink), logSink);
+  }
+
+  public void removeLogSink(ILogSink logSink) {
+    OsmAndCoreJNI.Logger_removeLogSink(swigCPtr, this, ILogSink.getCPtr(logSink), logSink);
+  }
+
+  public void removeAllLogSinks() {
+    OsmAndCoreJNI.Logger_removeAllLogSinks(swigCPtr, this);
+  }
+
+  public void flush() {
+    OsmAndCoreJNI.Logger_flush(swigCPtr, this);
+  }
+
+  public static Logger get() {
+    long cPtr = OsmAndCoreJNI.Logger_get();
+    return (cPtr == 0) ? null : new Logger(cPtr, true);
+  }
+
+}

JNI/src/net/osmand/core/jni/MapData.java

@@ -0,0 +1,50 @@
+/* ----------------------------------------------------------------------------
+ * 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 MapData {
+  private long swigCPtr;
+  private boolean swigCMemOwn;
+
+  protected MapData(long cPtr, boolean cMemoryOwn) {
+    swigCMemOwn = cMemoryOwn;
+    swigCPtr = cPtr;
+  }
+
+  protected static long getCPtr(MapData obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+
+  protected void finalize() {
+    delete();
+  }
+
+  public synchronized void delete() {
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        OsmAndCoreJNI.delete_MapData(swigCPtr);
+      }
+      swigCPtr = 0;
+    }
+  }
+
+  public IMapDataProvider.DataType getDataType() {
+    return IMapDataProvider.DataType.swigToEnum(OsmAndCoreJNI.MapData_dataType_get(swigCPtr, this));
+  }
+
+  public boolean getConsumableContentReleased() {
+    return OsmAndCoreJNI.MapData_consumableContentReleased_get(swigCPtr, this);
+  }
+
+  public void releaseConsumableContent() {
+    OsmAndCoreJNI.MapData_releaseConsumableContent(swigCPtr, this);
+  }
+
+}

JNI/src/net/osmand/core/jni/MapFoundationType.java

@@ -0,0 +1,54 @@
+/* ----------------------------------------------------------------------------
+ * 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 MapFoundationType {
+  Undefined(OsmAndCoreJNI.MapFoundationType_Undefined_get()),
+  Mixed,
+  FullLand,
+  FullWater;
+
+  public final int swigValue() {
+    return swigValue;
+  }
+
+  public static MapFoundationType swigToEnum(int swigValue) {
+    MapFoundationType[] swigValues = MapFoundationType.class.getEnumConstants();
+    if (swigValue < swigValues.length && swigValue >= 0 && swigValues[swigValue].swigValue == swigValue)
+      return swigValues[swigValue];
+    for (MapFoundationType swigEnum : swigValues)
+      if (swigEnum.swigValue == swigValue)
+        return swigEnum;
+    throw new IllegalArgumentException("No enum " + MapFoundationType.class + " with value " + swigValue);
+  }
+
+  @SuppressWarnings("unused")
+  private MapFoundationType() {
+    this.swigValue = SwigNext.next++;
+  }
+
+  @SuppressWarnings("unused")
+  private MapFoundationType(int swigValue) {
+    this.swigValue = swigValue;
+    SwigNext.next = swigValue+1;
+  }
+
+  @SuppressWarnings("unused")
+  private MapFoundationType(MapFoundationType swigEnum) {
+    this.swigValue = swigEnum.swigValue;
+    SwigNext.next = this.swigValue+1;
+  }
+
+  private final int swigValue;
+
+  private static class SwigNext {
+    private static int next = 0;
+  }
+}
+

JNI/src/net/osmand/core/jni/MapKeyedData.java

@@ -0,0 +1,45 @@
+/* ----------------------------------------------------------------------------
+ * 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 MapKeyedData extends MapData {
+  private long swigCPtr;
+  private boolean swigCMemOwnDerived;
+
+  protected MapKeyedData(long cPtr, boolean cMemoryOwn) {
+    super(OsmAndCoreJNI.MapKeyedData_SWIGSmartPtrUpcast(cPtr), true);
+    swigCMemOwnDerived = cMemoryOwn;
+    swigCPtr = cPtr;
+  }
+
+  protected static long getCPtr(MapKeyedData obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+
+  protected void finalize() {
+    delete();
+  }
+
+  public synchronized void delete() {
+    if (swigCPtr != 0) {
+      if (swigCMemOwnDerived) {
+        swigCMemOwnDerived = false;
+        OsmAndCoreJNI.delete_MapKeyedData(swigCPtr);
+      }
+      swigCPtr = 0;
+    }
+    super.delete();
+  }
+
+  public SWIGTYPE_p_void getKey() {
+    long cPtr = OsmAndCoreJNI.MapKeyedData_key_get(swigCPtr, this);
+    return (cPtr == 0) ? null : new SWIGTYPE_p_void(cPtr, false);
+  }
+
+}

JNI/src/net/osmand/core/jni/MapPresentationEnvironment.java

@@ -0,0 +1,190 @@
+/* ----------------------------------------------------------------------------
+ * 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 MapPresentationEnvironment {
+  private long swigCPtr;
+  private boolean swigCMemOwn;
+
+  protected MapPresentationEnvironment(long cPtr, boolean cMemoryOwn) {
+    swigCMemOwn = cMemoryOwn;
+    swigCPtr = cPtr;
+  }
+
+  protected static long getCPtr(MapPresentationEnvironment obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+
+  protected void finalize() {
+    delete();
+  }
+
+  public synchronized void delete() {
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        OsmAndCoreJNI.delete_MapPresentationEnvironment(swigCPtr);
+      }
+      swigCPtr = 0;
+    }
+  }
+
+  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(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(ResolvedMapStyle resolvedStyle, float displayDensityFactor, String localeLanguageId) {
+    this(OsmAndCoreJNI.new_MapPresentationEnvironment__SWIG_2(ResolvedMapStyle.getCPtr(resolvedStyle), resolvedStyle, displayDensityFactor, localeLanguageId), 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() {
+    long cPtr = OsmAndCoreJNI.MapPresentationEnvironment_styleBuiltinValueDefs_get(swigCPtr, this);
+    return (cPtr == 0) ? null : new MapStyleBuiltinValueDefinitions(cPtr, true);
+  }
+
+  public ResolvedMapStyle getResolvedStyle() {
+    long cPtr = OsmAndCoreJNI.MapPresentationEnvironment_resolvedStyle_get(swigCPtr, this);
+    return (cPtr == 0) ? null : new ResolvedMapStyle(cPtr, true);
+  }
+
+  public float getDisplayDensityFactor() {
+    return OsmAndCoreJNI.MapPresentationEnvironment_displayDensityFactor_get(swigCPtr, this);
+  }
+
+  public String getLocaleLanguageId() {
+    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);
+  }
+
+  public SWIGTYPE_p_std__shared_ptrT_OsmAnd__ObfMapSectionInfo_const_t getDummyMapSection() {
+    return new SWIGTYPE_p_std__shared_ptrT_OsmAnd__ObfMapSectionInfo_const_t(OsmAndCoreJNI.MapPresentationEnvironment_dummyMapSection_get(swigCPtr, this), false);
+  }
+
+  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_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) {
+    OsmAndCoreJNI.MapPresentationEnvironment_setSettings__SWIG_1(swigCPtr, this, SWIGTYPE_p_QHashT_QString_QString_t.getCPtr(newSettings));
+  }
+
+  public void applyTo(SWIGTYPE_p_OsmAnd__MapStyleEvaluator evaluator) {
+    OsmAndCoreJNI.MapPresentationEnvironment_applyTo(swigCPtr, this, SWIGTYPE_p_OsmAnd__MapStyleEvaluator.getCPtr(evaluator));
+  }
+
+  public boolean obtainShaderBitmap(String name, SWIGTYPE_p_std__shared_ptrT_SkBitmap_const_t outShaderBitmap) {
+    return OsmAndCoreJNI.MapPresentationEnvironment_obtainShaderBitmap(swigCPtr, this, name, SWIGTYPE_p_std__shared_ptrT_SkBitmap_const_t.getCPtr(outShaderBitmap));
+  }
+
+  public boolean obtainMapIcon(String name, SWIGTYPE_p_std__shared_ptrT_SkBitmap_const_t outIcon) {
+    return OsmAndCoreJNI.MapPresentationEnvironment_obtainMapIcon(swigCPtr, this, name, SWIGTYPE_p_std__shared_ptrT_SkBitmap_const_t.getCPtr(outIcon));
+  }
+
+  public boolean obtainTextShield(String name, SWIGTYPE_p_std__shared_ptrT_SkBitmap_const_t outTextShield) {
+    return OsmAndCoreJNI.MapPresentationEnvironment_obtainTextShield(swigCPtr, this, name, SWIGTYPE_p_std__shared_ptrT_SkBitmap_const_t.getCPtr(outTextShield));
+  }
+
+  public boolean obtainIconShield(String name, SWIGTYPE_p_std__shared_ptrT_SkBitmap_const_t outIconShield) {
+    return OsmAndCoreJNI.MapPresentationEnvironment_obtainIconShield(swigCPtr, this, name, SWIGTYPE_p_std__shared_ptrT_SkBitmap_const_t.getCPtr(outIconShield));
+  }
+
+  public ColorARGB getDefaultBackgroundColor(ZoomLevel zoom) {
+    return new ColorARGB(OsmAndCoreJNI.MapPresentationEnvironment_getDefaultBackgroundColor(swigCPtr, this, zoom.swigValue()), true);
+  }
+
+  public void obtainShadowRenderingOptions(ZoomLevel zoom, SWIGTYPE_p_int mode, ColorARGB color) {
+    OsmAndCoreJNI.MapPresentationEnvironment_obtainShadowRenderingOptions(swigCPtr, this, zoom.swigValue(), SWIGTYPE_p_int.getCPtr(mode), ColorARGB.getCPtr(color), color);
+  }
+
+  public double getPolygonAreaMinimalThreshold(ZoomLevel zoom) {
+    return OsmAndCoreJNI.MapPresentationEnvironment_getPolygonAreaMinimalThreshold(swigCPtr, this, zoom.swigValue());
+  }
+
+  public long getRoadDensityZoomTile(ZoomLevel zoom) {
+    return OsmAndCoreJNI.MapPresentationEnvironment_getRoadDensityZoomTile(swigCPtr, this, zoom.swigValue());
+  }
+
+  public long getRoadsDensityLimitPerTile(ZoomLevel zoom) {
+    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();
+
+}

JNI/src/net/osmand/core/jni/MapRendererClass.java

@@ -0,0 +1,52 @@
+/* ----------------------------------------------------------------------------
+ * 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 MapRendererClass {
+  AtlasMapRenderer_OpenGL2plus,
+  AtlasMapRenderer_OpenGLES2;
+
+  public final int swigValue() {
+    return swigValue;
+  }
+
+  public static MapRendererClass swigToEnum(int swigValue) {
+    MapRendererClass[] swigValues = MapRendererClass.class.getEnumConstants();
+    if (swigValue < swigValues.length && swigValue >= 0 && swigValues[swigValue].swigValue == swigValue)
+      return swigValues[swigValue];
+    for (MapRendererClass swigEnum : swigValues)
+      if (swigEnum.swigValue == swigValue)
+        return swigEnum;
+    throw new IllegalArgumentException("No enum " + MapRendererClass.class + " with value " + swigValue);
+  }
+
+  @SuppressWarnings("unused")
+  private MapRendererClass() {
+    this.swigValue = SwigNext.next++;
+  }
+
+  @SuppressWarnings("unused")
+  private MapRendererClass(int swigValue) {
+    this.swigValue = swigValue;
+    SwigNext.next = swigValue+1;
+  }
+
+  @SuppressWarnings("unused")
+  private MapRendererClass(MapRendererClass swigEnum) {
+    this.swigValue = swigEnum.swigValue;
+    SwigNext.next = this.swigValue+1;
+  }
+
+  private final int swigValue;
+
+  private static class SwigNext {
+    private static int next = 0;
+  }
+}
+

JNI/src/net/osmand/core/jni/MapRendererConfiguration.java

@@ -0,0 +1,83 @@
+/* ----------------------------------------------------------------------------
+ * 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 MapRendererConfiguration {
+  private long swigCPtr;
+  private boolean swigCMemOwn;
+
+  protected MapRendererConfiguration(long cPtr, boolean cMemoryOwn) {
+    swigCMemOwn = cMemoryOwn;
+    swigCPtr = cPtr;
+  }
+
+  protected static long getCPtr(MapRendererConfiguration obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+
+  protected void finalize() {
+    delete();
+  }
+
+  public synchronized void delete() {
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        OsmAndCoreJNI.delete_MapRendererConfiguration(swigCPtr);
+      }
+      swigCPtr = 0;
+    }
+  }
+
+  public MapRendererConfiguration() {
+    this(OsmAndCoreJNI.new_MapRendererConfiguration(), true);
+  }
+
+  public void setTexturesFilteringQuality(TextureFilteringQuality value) {
+    OsmAndCoreJNI.MapRendererConfiguration_texturesFilteringQuality_set(swigCPtr, this, value.swigValue());
+  }
+
+  public TextureFilteringQuality getTexturesFilteringQuality() {
+    return TextureFilteringQuality.swigToEnum(OsmAndCoreJNI.MapRendererConfiguration_texturesFilteringQuality_get(swigCPtr, this));
+  }
+
+  public void setLimitTextureColorDepthBy16bits(boolean value) {
+    OsmAndCoreJNI.MapRendererConfiguration_limitTextureColorDepthBy16bits_set(swigCPtr, this, value);
+  }
+
+  public boolean getLimitTextureColorDepthBy16bits() {
+    return OsmAndCoreJNI.MapRendererConfiguration_limitTextureColorDepthBy16bits_get(swigCPtr, this);
+  }
+
+  public void setHeixelsPerTileSide(long value) {
+    OsmAndCoreJNI.MapRendererConfiguration_heixelsPerTileSide_set(swigCPtr, this, value);
+  }
+
+  public long getHeixelsPerTileSide() {
+    return OsmAndCoreJNI.MapRendererConfiguration_heixelsPerTileSide_get(swigCPtr, this);
+  }
+
+  public void setPaletteTexturesAllowed(boolean value) {
+    OsmAndCoreJNI.MapRendererConfiguration_paletteTexturesAllowed_set(swigCPtr, this, value);
+  }
+
+  public boolean getPaletteTexturesAllowed() {
+    return OsmAndCoreJNI.MapRendererConfiguration_paletteTexturesAllowed_get(swigCPtr, this);
+  }
+
+  public void copyTo(MapRendererConfiguration other) {
+    OsmAndCoreJNI.MapRendererConfiguration_copyTo(swigCPtr, this, MapRendererConfiguration.getCPtr(other), other);
+  }
+
+  public MapRendererConfiguration createCopy() {
+    long cPtr = OsmAndCoreJNI.MapRendererConfiguration_createCopy(swigCPtr, this);
+    return (cPtr == 0) ? null : new MapRendererConfiguration(cPtr, true);
+  }
+
+}

JNI/src/net/osmand/core/jni/MapRendererDebugSettings.java

@@ -0,0 +1,187 @@
+/* ----------------------------------------------------------------------------
+ * 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 MapRendererDebugSettings {
+  private long swigCPtr;
+  private boolean swigCMemOwn;
+
+  protected MapRendererDebugSettings(long cPtr, boolean cMemoryOwn) {
+    swigCMemOwn = cMemoryOwn;
+    swigCPtr = cPtr;
+  }
+
+  protected static long getCPtr(MapRendererDebugSettings obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+
+  protected void finalize() {
+    delete();
+  }
+
+  public synchronized void delete() {
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        OsmAndCoreJNI.delete_MapRendererDebugSettings(swigCPtr);
+      }
+      swigCPtr = 0;
+    }
+  }
+
+  public MapRendererDebugSettings() {
+    this(OsmAndCoreJNI.new_MapRendererDebugSettings(), true);
+  }
+
+  public void setDebugStageEnabled(boolean value) {
+    OsmAndCoreJNI.MapRendererDebugSettings_debugStageEnabled_set(swigCPtr, this, value);
+  }
+
+  public boolean getDebugStageEnabled() {
+    return OsmAndCoreJNI.MapRendererDebugSettings_debugStageEnabled_get(swigCPtr, this);
+  }
+
+  public void setExcludeOnPathSymbolsFromProcessing(boolean value) {
+    OsmAndCoreJNI.MapRendererDebugSettings_excludeOnPathSymbolsFromProcessing_set(swigCPtr, this, value);
+  }
+
+  public boolean getExcludeOnPathSymbolsFromProcessing() {
+    return OsmAndCoreJNI.MapRendererDebugSettings_excludeOnPathSymbolsFromProcessing_get(swigCPtr, this);
+  }
+
+  public void setExcludeBillboardSymbolsFromProcessing(boolean value) {
+    OsmAndCoreJNI.MapRendererDebugSettings_excludeBillboardSymbolsFromProcessing_set(swigCPtr, this, value);
+  }
+
+  public boolean getExcludeBillboardSymbolsFromProcessing() {
+    return OsmAndCoreJNI.MapRendererDebugSettings_excludeBillboardSymbolsFromProcessing_get(swigCPtr, this);
+  }
+
+  public void setExcludeOnSurfaceSymbolsFromProcessing(boolean value) {
+    OsmAndCoreJNI.MapRendererDebugSettings_excludeOnSurfaceSymbolsFromProcessing_set(swigCPtr, this, value);
+  }
+
+  public boolean getExcludeOnSurfaceSymbolsFromProcessing() {
+    return OsmAndCoreJNI.MapRendererDebugSettings_excludeOnSurfaceSymbolsFromProcessing_get(swigCPtr, this);
+  }
+
+  public void setSkipSymbolsIntersectionCheck(boolean value) {
+    OsmAndCoreJNI.MapRendererDebugSettings_skipSymbolsIntersectionCheck_set(swigCPtr, this, value);
+  }
+
+  public boolean getSkipSymbolsIntersectionCheck() {
+    return OsmAndCoreJNI.MapRendererDebugSettings_skipSymbolsIntersectionCheck_get(swigCPtr, this);
+  }
+
+  public void setShowSymbolsBBoxesAcceptedByIntersectionCheck(boolean value) {
+    OsmAndCoreJNI.MapRendererDebugSettings_showSymbolsBBoxesAcceptedByIntersectionCheck_set(swigCPtr, this, value);
+  }
+
+  public boolean getShowSymbolsBBoxesAcceptedByIntersectionCheck() {
+    return OsmAndCoreJNI.MapRendererDebugSettings_showSymbolsBBoxesAcceptedByIntersectionCheck_get(swigCPtr, this);
+  }
+
+  public void setShowSymbolsBBoxesRejectedByIntersectionCheck(boolean value) {
+    OsmAndCoreJNI.MapRendererDebugSettings_showSymbolsBBoxesRejectedByIntersectionCheck_set(swigCPtr, this, value);
+  }
+
+  public boolean getShowSymbolsBBoxesRejectedByIntersectionCheck() {
+    return OsmAndCoreJNI.MapRendererDebugSettings_showSymbolsBBoxesRejectedByIntersectionCheck_get(swigCPtr, this);
+  }
+
+  public void setSkipSymbolsMinDistanceToSameContentFromOtherSymbolCheck(boolean value) {
+    OsmAndCoreJNI.MapRendererDebugSettings_skipSymbolsMinDistanceToSameContentFromOtherSymbolCheck_set(swigCPtr, this, value);
+  }
+
+  public boolean getSkipSymbolsMinDistanceToSameContentFromOtherSymbolCheck() {
+    return OsmAndCoreJNI.MapRendererDebugSettings_skipSymbolsMinDistanceToSameContentFromOtherSymbolCheck_get(swigCPtr, this);
+  }
+
+  public void setShowSymbolsBBoxesRejectedByMinDistanceToSameContentFromOtherSymbolCheck(boolean value) {
+    OsmAndCoreJNI.MapRendererDebugSettings_showSymbolsBBoxesRejectedByMinDistanceToSameContentFromOtherSymbolCheck_set(swigCPtr, this, value);
+  }
+
+  public boolean getShowSymbolsBBoxesRejectedByMinDistanceToSameContentFromOtherSymbolCheck() {
+    return OsmAndCoreJNI.MapRendererDebugSettings_showSymbolsBBoxesRejectedByMinDistanceToSameContentFromOtherSymbolCheck_get(swigCPtr, this);
+  }
+
+  public void setShowSymbolsCheckBBoxesRejectedByMinDistanceToSameContentFromOtherSymbolCheck(boolean value) {
+    OsmAndCoreJNI.MapRendererDebugSettings_showSymbolsCheckBBoxesRejectedByMinDistanceToSameContentFromOtherSymbolCheck_set(swigCPtr, this, value);
+  }
+
+  public boolean getShowSymbolsCheckBBoxesRejectedByMinDistanceToSameContentFromOtherSymbolCheck() {
+    return OsmAndCoreJNI.MapRendererDebugSettings_showSymbolsCheckBBoxesRejectedByMinDistanceToSameContentFromOtherSymbolCheck_get(swigCPtr, this);
+  }
+
+  public void setShowSymbolsBBoxesRejectedByPresentationMode(boolean value) {
+    OsmAndCoreJNI.MapRendererDebugSettings_showSymbolsBBoxesRejectedByPresentationMode_set(swigCPtr, this, value);
+  }
+
+  public boolean getShowSymbolsBBoxesRejectedByPresentationMode() {
+    return OsmAndCoreJNI.MapRendererDebugSettings_showSymbolsBBoxesRejectedByPresentationMode_get(swigCPtr, this);
+  }
+
+  public void setShowOnPathSymbolsRenderablesPaths(boolean value) {
+    OsmAndCoreJNI.MapRendererDebugSettings_showOnPathSymbolsRenderablesPaths_set(swigCPtr, this, value);
+  }
+
+  public boolean getShowOnPathSymbolsRenderablesPaths() {
+    return OsmAndCoreJNI.MapRendererDebugSettings_showOnPathSymbolsRenderablesPaths_get(swigCPtr, this);
+  }
+
+  public void setShowOnPath2dSymbolGlyphDetails(boolean value) {
+    OsmAndCoreJNI.MapRendererDebugSettings_showOnPath2dSymbolGlyphDetails_set(swigCPtr, this, value);
+  }
+
+  public boolean getShowOnPath2dSymbolGlyphDetails() {
+    return OsmAndCoreJNI.MapRendererDebugSettings_showOnPath2dSymbolGlyphDetails_get(swigCPtr, this);
+  }
+
+  public void setShowOnPath3dSymbolGlyphDetails(boolean value) {
+    OsmAndCoreJNI.MapRendererDebugSettings_showOnPath3dSymbolGlyphDetails_set(swigCPtr, this, value);
+  }
+
+  public boolean getShowOnPath3dSymbolGlyphDetails() {
+    return OsmAndCoreJNI.MapRendererDebugSettings_showOnPath3dSymbolGlyphDetails_get(swigCPtr, this);
+  }
+
+  public void setAllSymbolsTransparentForIntersectionLookup(boolean value) {
+    OsmAndCoreJNI.MapRendererDebugSettings_allSymbolsTransparentForIntersectionLookup_set(swigCPtr, this, value);
+  }
+
+  public boolean getAllSymbolsTransparentForIntersectionLookup() {
+    return OsmAndCoreJNI.MapRendererDebugSettings_allSymbolsTransparentForIntersectionLookup_get(swigCPtr, this);
+  }
+
+  public void setShowTooShortOnPathSymbolsRenderablesPaths(boolean value) {
+    OsmAndCoreJNI.MapRendererDebugSettings_showTooShortOnPathSymbolsRenderablesPaths_set(swigCPtr, this, value);
+  }
+
+  public boolean getShowTooShortOnPathSymbolsRenderablesPaths() {
+    return OsmAndCoreJNI.MapRendererDebugSettings_showTooShortOnPathSymbolsRenderablesPaths_get(swigCPtr, this);
+  }
+
+  public void setShowAllPaths(boolean value) {
+    OsmAndCoreJNI.MapRendererDebugSettings_showAllPaths_set(swigCPtr, this, value);
+  }
+
+  public boolean getShowAllPaths() {
+    return OsmAndCoreJNI.MapRendererDebugSettings_showAllPaths_get(swigCPtr, this);
+  }
+
+  public void copyTo(MapRendererDebugSettings other) {
+    OsmAndCoreJNI.MapRendererDebugSettings_copyTo(swigCPtr, this, MapRendererDebugSettings.getCPtr(other), other);
+  }
+
+  public MapRendererDebugSettings createCopy() {
+    long cPtr = OsmAndCoreJNI.MapRendererDebugSettings_createCopy(swigCPtr, this);
+    return (cPtr == 0) ? null : new MapRendererDebugSettings(cPtr, true);
+  }
+
+}

JNI/src/net/osmand/core/jni/MapRendererSetupOptions.java

@@ -0,0 +1,248 @@
+/* ----------------------------------------------------------------------------
+ * 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 MapRendererSetupOptions {
+  private long swigCPtr;
+  private boolean swigCMemOwn;
+
+  protected MapRendererSetupOptions(long cPtr, boolean cMemoryOwn) {
+    swigCMemOwn = cMemoryOwn;
+    swigCPtr = cPtr;
+  }
+
+  protected static long getCPtr(MapRendererSetupOptions obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+
+  protected void finalize() {
+    delete();
+  }
+
+  public synchronized void delete() {
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        OsmAndCoreJNI.delete_MapRendererSetupOptions(swigCPtr);
+      }
+      swigCPtr = 0;
+    }
+  }
+
+  public MapRendererSetupOptions() {
+    this(OsmAndCoreJNI.new_MapRendererSetupOptions(), true);
+  }
+
+  static public class IGpuWorkerThreadPrologue {
+    private long swigCPtr;
+    protected boolean swigCMemOwn;
+  
+    protected IGpuWorkerThreadPrologue(long cPtr, boolean cMemoryOwn) {
+      swigCMemOwn = cMemoryOwn;
+      swigCPtr = cPtr;
+    }
+  
+    protected static long getCPtr(IGpuWorkerThreadPrologue obj) {
+      return (obj == null) ? 0 : obj.swigCPtr;
+    }
+  
+    protected void finalize() {
+      delete();
+    }
+  
+    public synchronized void delete() {
+      if (swigCPtr != 0) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          OsmAndCoreJNI.delete_MapRendererSetupOptions_IGpuWorkerThreadPrologue(swigCPtr);
+        }
+        swigCPtr = 0;
+      }
+    }
+  
+    protected void swigDirectorDisconnect() {
+      swigCMemOwn = false;
+      delete();
+    }
+  
+    public void swigReleaseOwnership() {
+      swigCMemOwn = false;
+      OsmAndCoreJNI.MapRendererSetupOptions_IGpuWorkerThreadPrologue_change_ownership(this, swigCPtr, false);
+    }
+  
+    public void swigTakeOwnership() {
+      swigCMemOwn = true;
+      OsmAndCoreJNI.MapRendererSetupOptions_IGpuWorkerThreadPrologue_change_ownership(this, swigCPtr, true);
+    }
+  
+    public IGpuWorkerThreadPrologue() {
+      this(OsmAndCoreJNI.new_MapRendererSetupOptions_IGpuWorkerThreadPrologue(), true);
+      OsmAndCoreJNI.MapRendererSetupOptions_IGpuWorkerThreadPrologue_director_connect(this, swigCPtr, swigCMemOwn, true);
+    }
+  
+    public void method(IMapRenderer mapRenderer) {
+      OsmAndCoreJNI.MapRendererSetupOptions_IGpuWorkerThreadPrologue_method(swigCPtr, this, IMapRenderer.getCPtr(mapRenderer), mapRenderer);
+    }
+  
+    public SWIGTYPE_p_OsmAnd__MapRendererSetupOptions__GpuWorkerThreadPrologue getBinding() {
+      return new SWIGTYPE_p_OsmAnd__MapRendererSetupOptions__GpuWorkerThreadPrologue(OsmAndCoreJNI.MapRendererSetupOptions_IGpuWorkerThreadPrologue_getBinding(swigCPtr, this), true);
+    }
+  
+  }
+
+  static public class IGpuWorkerThreadEpilogue {
+    private long swigCPtr;
+    protected boolean swigCMemOwn;
+  
+    protected IGpuWorkerThreadEpilogue(long cPtr, boolean cMemoryOwn) {
+      swigCMemOwn = cMemoryOwn;
+      swigCPtr = cPtr;
+    }
+  
+    protected static long getCPtr(IGpuWorkerThreadEpilogue obj) {
+      return (obj == null) ? 0 : obj.swigCPtr;
+    }
+  
+    protected void finalize() {
+      delete();
+    }
+  
+    public synchronized void delete() {
+      if (swigCPtr != 0) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          OsmAndCoreJNI.delete_MapRendererSetupOptions_IGpuWorkerThreadEpilogue(swigCPtr);
+        }
+        swigCPtr = 0;
+      }
+    }
+  
+    protected void swigDirectorDisconnect() {
+      swigCMemOwn = false;
+      delete();
+    }
+  
+    public void swigReleaseOwnership() {
+      swigCMemOwn = false;
+      OsmAndCoreJNI.MapRendererSetupOptions_IGpuWorkerThreadEpilogue_change_ownership(this, swigCPtr, false);
+    }
+  
+    public void swigTakeOwnership() {
+      swigCMemOwn = true;
+      OsmAndCoreJNI.MapRendererSetupOptions_IGpuWorkerThreadEpilogue_change_ownership(this, swigCPtr, true);
+    }
+  
+    public IGpuWorkerThreadEpilogue() {
+      this(OsmAndCoreJNI.new_MapRendererSetupOptions_IGpuWorkerThreadEpilogue(), true);
+      OsmAndCoreJNI.MapRendererSetupOptions_IGpuWorkerThreadEpilogue_director_connect(this, swigCPtr, swigCMemOwn, true);
+    }
+  
+    public void method(IMapRenderer mapRenderer) {
+      OsmAndCoreJNI.MapRendererSetupOptions_IGpuWorkerThreadEpilogue_method(swigCPtr, this, IMapRenderer.getCPtr(mapRenderer), mapRenderer);
+    }
+  
+    public SWIGTYPE_p_OsmAnd__MapRendererSetupOptions__GpuWorkerThreadEpilogue getBinding() {
+      return new SWIGTYPE_p_OsmAnd__MapRendererSetupOptions__GpuWorkerThreadEpilogue(OsmAndCoreJNI.MapRendererSetupOptions_IGpuWorkerThreadEpilogue_getBinding(swigCPtr, this), true);
+    }
+  
+  }
+
+  public void setGpuWorkerThreadEnabled(boolean value) {
+    OsmAndCoreJNI.MapRendererSetupOptions_gpuWorkerThreadEnabled_set(swigCPtr, this, value);
+  }
+
+  public boolean getGpuWorkerThreadEnabled() {
+    return OsmAndCoreJNI.MapRendererSetupOptions_gpuWorkerThreadEnabled_get(swigCPtr, this);
+  }
+
+  public void setGpuWorkerThreadPrologue(SWIGTYPE_p_OsmAnd__MapRendererSetupOptions__GpuWorkerThreadPrologue value) {
+    OsmAndCoreJNI.MapRendererSetupOptions_gpuWorkerThreadPrologue_set(swigCPtr, this, SWIGTYPE_p_OsmAnd__MapRendererSetupOptions__GpuWorkerThreadPrologue.getCPtr(value));
+  }
+
+  public SWIGTYPE_p_OsmAnd__MapRendererSetupOptions__GpuWorkerThreadPrologue getGpuWorkerThreadPrologue() {
+    long cPtr = OsmAndCoreJNI.MapRendererSetupOptions_gpuWorkerThreadPrologue_get(swigCPtr, this);
+    return (cPtr == 0) ? null : new SWIGTYPE_p_OsmAnd__MapRendererSetupOptions__GpuWorkerThreadPrologue(cPtr, false);
+  }
+
+  public void setGpuWorkerThreadEpilogue(SWIGTYPE_p_OsmAnd__MapRendererSetupOptions__GpuWorkerThreadEpilogue value) {
+    OsmAndCoreJNI.MapRendererSetupOptions_gpuWorkerThreadEpilogue_set(swigCPtr, this, SWIGTYPE_p_OsmAnd__MapRendererSetupOptions__GpuWorkerThreadEpilogue.getCPtr(value));
+  }
+
+  public SWIGTYPE_p_OsmAnd__MapRendererSetupOptions__GpuWorkerThreadEpilogue getGpuWorkerThreadEpilogue() {
+    long cPtr = OsmAndCoreJNI.MapRendererSetupOptions_gpuWorkerThreadEpilogue_get(swigCPtr, this);
+    return (cPtr == 0) ? null : new SWIGTYPE_p_OsmAnd__MapRendererSetupOptions__GpuWorkerThreadEpilogue(cPtr, false);
+  }
+
+  static public class IFrameUpdateRequestCallback {
+    private long swigCPtr;
+    protected boolean swigCMemOwn;
+  
+    protected IFrameUpdateRequestCallback(long cPtr, boolean cMemoryOwn) {
+      swigCMemOwn = cMemoryOwn;
+      swigCPtr = cPtr;
+    }
+  
+    protected static long getCPtr(IFrameUpdateRequestCallback obj) {
+      return (obj == null) ? 0 : obj.swigCPtr;
+    }
+  
+    protected void finalize() {
+      delete();
+    }
+  
+    public synchronized void delete() {
+      if (swigCPtr != 0) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          OsmAndCoreJNI.delete_MapRendererSetupOptions_IFrameUpdateRequestCallback(swigCPtr);
+        }
+        swigCPtr = 0;
+      }
+    }
+  
+    protected void swigDirectorDisconnect() {
+      swigCMemOwn = false;
+      delete();
+    }
+  
+    public void swigReleaseOwnership() {
+      swigCMemOwn = false;
+      OsmAndCoreJNI.MapRendererSetupOptions_IFrameUpdateRequestCallback_change_ownership(this, swigCPtr, false);
+    }
+  
+    public void swigTakeOwnership() {
+      swigCMemOwn = true;
+      OsmAndCoreJNI.MapRendererSetupOptions_IFrameUpdateRequestCallback_change_ownership(this, swigCPtr, true);
+    }
+  
+    public IFrameUpdateRequestCallback() {
+      this(OsmAndCoreJNI.new_MapRendererSetupOptions_IFrameUpdateRequestCallback(), true);
+      OsmAndCoreJNI.MapRendererSetupOptions_IFrameUpdateRequestCallback_director_connect(this, swigCPtr, swigCMemOwn, true);
+    }
+  
+    public void method(IMapRenderer mapRenderer) {
+      OsmAndCoreJNI.MapRendererSetupOptions_IFrameUpdateRequestCallback_method(swigCPtr, this, IMapRenderer.getCPtr(mapRenderer), mapRenderer);
+    }
+  
+    public SWIGTYPE_p_OsmAnd__MapRendererSetupOptions__FrameUpdateRequestCallback getBinding() {
+      return new SWIGTYPE_p_OsmAnd__MapRendererSetupOptions__FrameUpdateRequestCallback(OsmAndCoreJNI.MapRendererSetupOptions_IFrameUpdateRequestCallback_getBinding(swigCPtr, this), true);
+    }
+  
+  }
+
+  public void setFrameUpdateRequestCallback(SWIGTYPE_p_OsmAnd__MapRendererSetupOptions__FrameUpdateRequestCallback value) {
+    OsmAndCoreJNI.MapRendererSetupOptions_frameUpdateRequestCallback_set(swigCPtr, this, SWIGTYPE_p_OsmAnd__MapRendererSetupOptions__FrameUpdateRequestCallback.getCPtr(value));
+  }
+
+  public SWIGTYPE_p_OsmAnd__MapRendererSetupOptions__FrameUpdateRequestCallback getFrameUpdateRequestCallback() {
+    long cPtr = OsmAndCoreJNI.MapRendererSetupOptions_frameUpdateRequestCallback_get(swigCPtr, this);
+    return (cPtr == 0) ? null : new SWIGTYPE_p_OsmAnd__MapRendererSetupOptions__FrameUpdateRequestCallback(cPtr, false);
+  }
+
+}

JNI/src/net/osmand/core/jni/MapRendererState.java

@@ -0,0 +1,209 @@
+/* ----------------------------------------------------------------------------
+ * 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 MapRendererState {
+  private long swigCPtr;
+  protected boolean swigCMemOwn;
+
+  protected MapRendererState(long cPtr, boolean cMemoryOwn) {
+    swigCMemOwn = cMemoryOwn;
+    swigCPtr = cPtr;
+  }
+
+  protected static long getCPtr(MapRendererState obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+
+  protected void finalize() {
+    delete();
+  }
+
+  public synchronized void delete() {
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        OsmAndCoreJNI.delete_MapRendererState(swigCPtr);
+      }
+      swigCPtr = 0;
+    }
+  }
+
+  public MapRendererState() {
+    this(OsmAndCoreJNI.new_MapRendererState(), true);
+  }
+
+  public void setRasterLayerProviders(SWIGTYPE_p_std__arrayT_std__shared_ptrT_OsmAnd__IMapRasterBitmapTileProvider_t_OsmAnd__RasterMapLayersCount_t value) {
+    OsmAndCoreJNI.MapRendererState_rasterLayerProviders_set(swigCPtr, this, SWIGTYPE_p_std__arrayT_std__shared_ptrT_OsmAnd__IMapRasterBitmapTileProvider_t_OsmAnd__RasterMapLayersCount_t.getCPtr(value));
+  }
+
+  public SWIGTYPE_p_std__arrayT_std__shared_ptrT_OsmAnd__IMapRasterBitmapTileProvider_t_OsmAnd__RasterMapLayersCount_t getRasterLayerProviders() {
+    return new SWIGTYPE_p_std__arrayT_std__shared_ptrT_OsmAnd__IMapRasterBitmapTileProvider_t_OsmAnd__RasterMapLayersCount_t(OsmAndCoreJNI.MapRendererState_rasterLayerProviders_get(swigCPtr, this), true);
+  }
+
+  public void setRasterLayerOpacity(SWIGTYPE_p_std__arrayT_float_OsmAnd__RasterMapLayersCount_t value) {
+    OsmAndCoreJNI.MapRendererState_rasterLayerOpacity_set(swigCPtr, this, SWIGTYPE_p_std__arrayT_float_OsmAnd__RasterMapLayersCount_t.getCPtr(value));
+  }
+
+  public SWIGTYPE_p_std__arrayT_float_OsmAnd__RasterMapLayersCount_t getRasterLayerOpacity() {
+    return new SWIGTYPE_p_std__arrayT_float_OsmAnd__RasterMapLayersCount_t(OsmAndCoreJNI.MapRendererState_rasterLayerOpacity_get(swigCPtr, this), true);
+  }
+
+  public void setElevationDataProvider(IMapElevationDataProvider value) {
+    OsmAndCoreJNI.MapRendererState_elevationDataProvider_set(swigCPtr, this, IMapElevationDataProvider.getCPtr(value), value);
+  }
+
+  public IMapElevationDataProvider getElevationDataProvider() {
+    long cPtr = OsmAndCoreJNI.MapRendererState_elevationDataProvider_get(swigCPtr, this);
+    return (cPtr == 0) ? null : new IMapElevationDataProvider(cPtr, true);
+  }
+
+  public void setElevationDataScaleFactor(float value) {
+    OsmAndCoreJNI.MapRendererState_elevationDataScaleFactor_set(swigCPtr, this, value);
+  }
+
+  public float getElevationDataScaleFactor() {
+    return OsmAndCoreJNI.MapRendererState_elevationDataScaleFactor_get(swigCPtr, this);
+  }
+
+  public void setSymbolProviders(SWIGTYPE_p_QSetT_std__shared_ptrT_OsmAnd__IMapDataProvider_t_t value) {
+    OsmAndCoreJNI.MapRendererState_symbolProviders_set(swigCPtr, this, SWIGTYPE_p_QSetT_std__shared_ptrT_OsmAnd__IMapDataProvider_t_t.getCPtr(value));
+  }
+
+  public SWIGTYPE_p_QSetT_std__shared_ptrT_OsmAnd__IMapDataProvider_t_t getSymbolProviders() {
+    long cPtr = OsmAndCoreJNI.MapRendererState_symbolProviders_get(swigCPtr, this);
+    return (cPtr == 0) ? null : new SWIGTYPE_p_QSetT_std__shared_ptrT_OsmAnd__IMapDataProvider_t_t(cPtr, false);
+  }
+
+  public void setWindowSize(PointI value) {
+    OsmAndCoreJNI.MapRendererState_windowSize_set(swigCPtr, this, PointI.getCPtr(value), value);
+  }
+
+  public PointI getWindowSize() {
+    long cPtr = OsmAndCoreJNI.MapRendererState_windowSize_get(swigCPtr, this);
+    return (cPtr == 0) ? null : new PointI(cPtr, false);
+  }
+
+  public void setViewport(AreaI value) {
+    OsmAndCoreJNI.MapRendererState_viewport_set(swigCPtr, this, AreaI.getCPtr(value), value);
+  }
+
+  public AreaI getViewport() {
+    long cPtr = OsmAndCoreJNI.MapRendererState_viewport_get(swigCPtr, this);
+    return (cPtr == 0) ? null : new AreaI(cPtr, false);
+  }
+
+  public void setFieldOfView(float value) {
+    OsmAndCoreJNI.MapRendererState_fieldOfView_set(swigCPtr, this, value);
+  }
+
+  public float getFieldOfView() {
+    return OsmAndCoreJNI.MapRendererState_fieldOfView_get(swigCPtr, this);
+  }
+
+  public void setSkyColor(FColorRGB value) {
+    OsmAndCoreJNI.MapRendererState_skyColor_set(swigCPtr, this, FColorRGB.getCPtr(value), value);
+  }
+
+  public FColorRGB getSkyColor() {
+    long cPtr = OsmAndCoreJNI.MapRendererState_skyColor_get(swigCPtr, this);
+    return (cPtr == 0) ? null : new FColorRGB(cPtr, false);
+  }
+
+  public void setFogColor(FColorRGB value) {
+    OsmAndCoreJNI.MapRendererState_fogColor_set(swigCPtr, this, FColorRGB.getCPtr(value), value);
+  }
+
+  public FColorRGB getFogColor() {
+    long cPtr = OsmAndCoreJNI.MapRendererState_fogColor_get(swigCPtr, this);
+    return (cPtr == 0) ? null : new FColorRGB(cPtr, false);
+  }
+
+  public void setFogDistance(float value) {
+    OsmAndCoreJNI.MapRendererState_fogDistance_set(swigCPtr, this, value);
+  }
+
+  public float getFogDistance() {
+    return OsmAndCoreJNI.MapRendererState_fogDistance_get(swigCPtr, this);
+  }
+
+  public void setFogOriginFactor(float value) {
+    OsmAndCoreJNI.MapRendererState_fogOriginFactor_set(swigCPtr, this, value);
+  }
+
+  public float getFogOriginFactor() {
+    return OsmAndCoreJNI.MapRendererState_fogOriginFactor_get(swigCPtr, this);
+  }
+
+  public void setFogHeightOriginFactor(float value) {
+    OsmAndCoreJNI.MapRendererState_fogHeightOriginFactor_set(swigCPtr, this, value);
+  }
+
+  public float getFogHeightOriginFactor() {
+    return OsmAndCoreJNI.MapRendererState_fogHeightOriginFactor_get(swigCPtr, this);
+  }
+
+  public void setFogDensity(float value) {
+    OsmAndCoreJNI.MapRendererState_fogDensity_set(swigCPtr, this, value);
+  }
+
+  public float getFogDensity() {
+    return OsmAndCoreJNI.MapRendererState_fogDensity_get(swigCPtr, this);
+  }
+
+  public void setAzimuth(float value) {
+    OsmAndCoreJNI.MapRendererState_azimuth_set(swigCPtr, this, value);
+  }
+
+  public float getAzimuth() {
+    return OsmAndCoreJNI.MapRendererState_azimuth_get(swigCPtr, this);
+  }
+
+  public void setElevationAngle(float value) {
+    OsmAndCoreJNI.MapRendererState_elevationAngle_set(swigCPtr, this, value);
+  }
+
+  public float getElevationAngle() {
+    return OsmAndCoreJNI.MapRendererState_elevationAngle_get(swigCPtr, this);
+  }
+
+  public void setTarget31(PointI value) {
+    OsmAndCoreJNI.MapRendererState_target31_set(swigCPtr, this, PointI.getCPtr(value), value);
+  }
+
+  public PointI getTarget31() {
+    long cPtr = OsmAndCoreJNI.MapRendererState_target31_get(swigCPtr, this);
+    return (cPtr == 0) ? null : new PointI(cPtr, false);
+  }
+
+  public void setRequestedZoom(float value) {
+    OsmAndCoreJNI.MapRendererState_requestedZoom_set(swigCPtr, this, value);
+  }
+
+  public float getRequestedZoom() {
+    return OsmAndCoreJNI.MapRendererState_requestedZoom_get(swigCPtr, this);
+  }
+
+  public void setZoomBase(ZoomLevel value) {
+    OsmAndCoreJNI.MapRendererState_zoomBase_set(swigCPtr, this, value.swigValue());
+  }
+
+  public ZoomLevel getZoomBase() {
+    return ZoomLevel.swigToEnum(OsmAndCoreJNI.MapRendererState_zoomBase_get(swigCPtr, this));
+  }
+
+  public void setZoomFraction(float value) {
+    OsmAndCoreJNI.MapRendererState_zoomFraction_set(swigCPtr, this, value);
+  }
+
+  public float getZoomFraction() {
+    return OsmAndCoreJNI.MapRendererState_zoomFraction_get(swigCPtr, this);
+  }
+
+}

JNI/src/net/osmand/core/jni/MapRendererStateChange.java

@@ -0,0 +1,64 @@
+/* ----------------------------------------------------------------------------
+ * 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 MapRendererStateChange {
+  RasterLayers_Providers(OsmAndCoreJNI.MapRendererStateChange_RasterLayers_Providers_get()),
+  RasterLayers_Opacity,
+  ElevationData_Provider,
+  ElevationData_ScaleFactor,
+  Symbols_Providers,
+  WindowSize,
+  Viewport,
+  FieldOfView,
+  SkyColor,
+  FogParameters,
+  Azimuth,
+  ElevationAngle,
+  Target,
+  Zoom;
+
+  public final int swigValue() {
+    return swigValue;
+  }
+
+  public static MapRendererStateChange swigToEnum(int swigValue) {
+    MapRendererStateChange[] swigValues = MapRendererStateChange.class.getEnumConstants();
+    if (swigValue < swigValues.length && swigValue >= 0 && swigValues[swigValue].swigValue == swigValue)
+      return swigValues[swigValue];
+    for (MapRendererStateChange swigEnum : swigValues)
+      if (swigEnum.swigValue == swigValue)
+        return swigEnum;
+    throw new IllegalArgumentException("No enum " + MapRendererStateChange.class + " with value " + swigValue);
+  }
+
+  @SuppressWarnings("unused")
+  private MapRendererStateChange() {
+    this.swigValue = SwigNext.next++;
+  }
+
+  @SuppressWarnings("unused")
+  private MapRendererStateChange(int swigValue) {
+    this.swigValue = swigValue;
+    SwigNext.next = swigValue+1;
+  }
+
+  @SuppressWarnings("unused")
+  private MapRendererStateChange(MapRendererStateChange swigEnum) {
+    this.swigValue = swigEnum.swigValue;
+    SwigNext.next = this.swigValue+1;
+  }
+
+  private final int swigValue;
+
+  private static class SwigNext {
+    private static int next = 0;
+  }
+}
+

JNI/src/net/osmand/core/jni/MapRendererStateChanges.java

@@ -0,0 +1,66 @@
+/* ----------------------------------------------------------------------------
+ * 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 MapRendererStateChanges {
+  private long swigCPtr;
+  protected boolean swigCMemOwn;
+
+  protected MapRendererStateChanges(long cPtr, boolean cMemoryOwn) {
+    swigCMemOwn = cMemoryOwn;
+    swigCPtr = cPtr;
+  }
+
+  protected static long getCPtr(MapRendererStateChanges obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+
+  protected void finalize() {
+    delete();
+  }
+
+  public synchronized void delete() {
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        OsmAndCoreJNI.delete_MapRendererStateChanges(swigCPtr);
+      }
+      swigCPtr = 0;
+    }
+  }
+
+  public MapRendererStateChanges() {
+    this(OsmAndCoreJNI.new_MapRendererStateChanges__SWIG_0(), true);
+  }
+
+  public MapRendererStateChanges(long storage_) {
+    this(OsmAndCoreJNI.new_MapRendererStateChanges__SWIG_1(storage_), true);
+  }
+
+  public MapRendererStateChanges(SWIGTYPE_p_OsmAnd__BitmaskT_OsmAnd__MapRendererStateChange_unsigned_int_t__BitmaskT that) {
+    this(OsmAndCoreJNI.new_MapRendererStateChanges__SWIG_2(SWIGTYPE_p_OsmAnd__BitmaskT_OsmAnd__MapRendererStateChange_unsigned_int_t__BitmaskT.getCPtr(that)), true);
+  }
+
+  public boolean isSet(MapRendererStateChange flag) {
+    return OsmAndCoreJNI.MapRendererStateChanges_isSet(swigCPtr, this, flag.swigValue());
+  }
+
+  public SWIGTYPE_p_OsmAnd__BitmaskT_OsmAnd__MapRendererStateChange_unsigned_int_t__BitmaskT set(MapRendererStateChange flag) {
+    return new SWIGTYPE_p_OsmAnd__BitmaskT_OsmAnd__MapRendererStateChange_unsigned_int_t__BitmaskT(OsmAndCoreJNI.MapRendererStateChanges_set(swigCPtr, this, flag.swigValue()), false);
+  }
+
+  public SWIGTYPE_p_OsmAnd__BitmaskT_OsmAnd__MapRendererStateChange_unsigned_int_t__BitmaskT unset(MapRendererStateChange flag) {
+    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);
+  }
+
+}

JNI/src/net/osmand/core/jni/MapStyleBuiltinValueDefinitions.java

@@ -0,0 +1,82 @@
+/* ----------------------------------------------------------------------------
+ * 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 MapStyleBuiltinValueDefinitions {
+  private long swigCPtr;
+  private boolean swigCMemOwn;
+
+  protected MapStyleBuiltinValueDefinitions(long cPtr, boolean cMemoryOwn) {
+    swigCMemOwn = cMemoryOwn;
+    swigCPtr = cPtr;
+  }
+
+  protected static long getCPtr(MapStyleBuiltinValueDefinitions obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+
+  protected void finalize() {
+    delete();
+  }
+
+  public synchronized void delete() {
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        OsmAndCoreJNI.delete_MapStyleBuiltinValueDefinitions(swigCPtr);
+      }
+      swigCPtr = 0;
+    }
+  }
+
+  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);
+  }
+
+}

JNI/src/net/osmand/core/jni/MapStyleConstantValue.java

@@ -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());
+  }
+
+}

JNI/src/net/osmand/core/jni/MapStylePreset.java

@@ -0,0 +1,108 @@
+/* ----------------------------------------------------------------------------
+ * 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 MapStylePreset {
+  private long swigCPtr;
+  private boolean swigCMemOwn;
+
+  protected MapStylePreset(long cPtr, boolean cMemoryOwn) {
+    swigCMemOwn = cMemoryOwn;
+    swigCPtr = cPtr;
+  }
+
+  protected static long getCPtr(MapStylePreset obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+
+  protected void finalize() {
+    delete();
+  }
+
+  public synchronized void delete() {
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        OsmAndCoreJNI.delete_MapStylePreset(swigCPtr);
+      }
+      swigCPtr = 0;
+    }
+  }
+
+  public MapStylePreset(MapStylePreset.Type type, String name, String styleName) {
+    this(OsmAndCoreJNI.new_MapStylePreset(type.swigValue(), name, styleName), true);
+  }
+
+  public MapStylePreset.Type getType() {
+    return MapStylePreset.Type.swigToEnum(OsmAndCoreJNI.MapStylePreset_type_get(swigCPtr, this));
+  }
+
+  public String getName() {
+    return OsmAndCoreJNI.MapStylePreset_name_get(swigCPtr, this);
+  }
+
+  public String getStyleName() {
+    return OsmAndCoreJNI.MapStylePreset_styleName_get(swigCPtr, this);
+  }
+
+  public void setAttributes(SWIGTYPE_p_QHashT_QString_QString_t value) {
+    OsmAndCoreJNI.MapStylePreset_attributes_set(swigCPtr, this, SWIGTYPE_p_QHashT_QString_QString_t.getCPtr(value));
+  }
+
+  public SWIGTYPE_p_QHashT_QString_QString_t getAttributes() {
+    long cPtr = OsmAndCoreJNI.MapStylePreset_attributes_get(swigCPtr, this);
+    return (cPtr == 0) ? null : new SWIGTYPE_p_QHashT_QString_QString_t(cPtr, false);
+  }
+
+  public enum Type {
+    General,
+    Pedestrian,
+    Bicycle,
+    Car,
+    Custom;
+
+    public final int swigValue() {
+      return swigValue;
+    }
+
+    public static Type swigToEnum(int swigValue) {
+      Type[] swigValues = Type.class.getEnumConstants();
+      if (swigValue < swigValues.length && swigValue >= 0 && swigValues[swigValue].swigValue == swigValue)
+        return swigValues[swigValue];
+      for (Type swigEnum : swigValues)
+        if (swigEnum.swigValue == swigValue)
+          return swigEnum;
+      throw new IllegalArgumentException("No enum " + Type.class + " with value " + swigValue);
+    }
+
+    @SuppressWarnings("unused")
+    private Type() {
+      this.swigValue = SwigNext.next++;
+    }
+
+    @SuppressWarnings("unused")
+    private Type(int swigValue) {
+      this.swigValue = swigValue;
+      SwigNext.next = swigValue+1;
+    }
+
+    @SuppressWarnings("unused")
+    private Type(Type swigEnum) {
+      this.swigValue = swigEnum.swigValue;
+      SwigNext.next = this.swigValue+1;
+    }
+
+    private final int swigValue;
+
+    private static class SwigNext {
+      private static int next = 0;
+    }
+  }
+
+}

JNI/src/net/osmand/core/jni/MapStyleRulesetType.java

@@ -0,0 +1,57 @@
+/* ----------------------------------------------------------------------------
+ * 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 MapStyleRulesetType {
+  Invalid(OsmAndCoreJNI.MapStyleRulesetType_Invalid_get()),
+  Point,
+  Polyline,
+  Polygon,
+  Text,
+  Order,
+  __LAST;
+
+  public final int swigValue() {
+    return swigValue;
+  }
+
+  public static MapStyleRulesetType swigToEnum(int swigValue) {
+    MapStyleRulesetType[] swigValues = MapStyleRulesetType.class.getEnumConstants();
+    if (swigValue < swigValues.length && swigValue >= 0 && swigValues[swigValue].swigValue == swigValue)
+      return swigValues[swigValue];
+    for (MapStyleRulesetType swigEnum : swigValues)
+      if (swigEnum.swigValue == swigValue)
+        return swigEnum;
+    throw new IllegalArgumentException("No enum " + MapStyleRulesetType.class + " with value " + swigValue);
+  }
+
+  @SuppressWarnings("unused")
+  private MapStyleRulesetType() {
+    this.swigValue = SwigNext.next++;
+  }
+
+  @SuppressWarnings("unused")
+  private MapStyleRulesetType(int swigValue) {
+    this.swigValue = swigValue;
+    SwigNext.next = swigValue+1;
+  }
+
+  @SuppressWarnings("unused")
+  private MapStyleRulesetType(MapStyleRulesetType swigEnum) {
+    this.swigValue = swigEnum.swigValue;
+    SwigNext.next = this.swigValue+1;
+  }
+
+  private final int swigValue;
+
+  private static class SwigNext {
+    private static int next = 0;
+  }
+}
+

JNI/src/net/osmand/core/jni/MapStyleValueDataType.java

@@ -0,0 +1,55 @@
+/* ----------------------------------------------------------------------------
+ * 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 MapStyleValueDataType {
+  Boolean,
+  Integer,
+  Float,
+  String,
+  Color;
+
+  public final int swigValue() {
+    return swigValue;
+  }
+
+  public static MapStyleValueDataType swigToEnum(int swigValue) {
+    MapStyleValueDataType[] swigValues = MapStyleValueDataType.class.getEnumConstants();
+    if (swigValue < swigValues.length && swigValue >= 0 && swigValues[swigValue].swigValue == swigValue)
+      return swigValues[swigValue];
+    for (MapStyleValueDataType swigEnum : swigValues)
+      if (swigEnum.swigValue == swigValue)
+        return swigEnum;
+    throw new IllegalArgumentException("No enum " + MapStyleValueDataType.class + " with value " + swigValue);
+  }
+
+  @SuppressWarnings("unused")
+  private MapStyleValueDataType() {
+    this.swigValue = SwigNext.next++;
+  }
+
+  @SuppressWarnings("unused")
+  private MapStyleValueDataType(int swigValue) {
+    this.swigValue = swigValue;
+    SwigNext.next = swigValue+1;
+  }
+
+  @SuppressWarnings("unused")
+  private MapStyleValueDataType(MapStyleValueDataType swigEnum) {
+    this.swigValue = swigEnum.swigValue;
+    SwigNext.next = this.swigValue+1;
+  }
+
+  private final int swigValue;
+
+  private static class SwigNext {
+    private static int next = 0;
+  }
+}
+

JNI/src/net/osmand/core/jni/MapStyleValueDefinition.java

@@ -0,0 +1,100 @@
+/* ----------------------------------------------------------------------------
+ * 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 MapStyleValueDefinition {
+  private long swigCPtr;
+  private boolean swigCMemOwn;
+
+  protected MapStyleValueDefinition(long cPtr, boolean cMemoryOwn) {
+    swigCMemOwn = cMemoryOwn;
+    swigCPtr = cPtr;
+  }
+
+  protected static long getCPtr(MapStyleValueDefinition obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+
+  protected void finalize() {
+    delete();
+  }
+
+  public synchronized void delete() {
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        OsmAndCoreJNI.delete_MapStyleValueDefinition(swigCPtr);
+      }
+      swigCPtr = 0;
+    }
+  }
+
+  public MapStyleValueDefinition(MapStyleValueDefinition.Class valueClass, MapStyleValueDataType dataType, String name, boolean isComplex) {
+    this(OsmAndCoreJNI.new_MapStyleValueDefinition(valueClass.swigValue(), dataType.swigValue(), name, isComplex), true);
+  }
+
+  public MapStyleValueDefinition.Class getValueClass() {
+    return MapStyleValueDefinition.Class.swigToEnum(OsmAndCoreJNI.MapStyleValueDefinition_valueClass_get(swigCPtr, this));
+  }
+
+  public MapStyleValueDataType getDataType() {
+    return MapStyleValueDataType.swigToEnum(OsmAndCoreJNI.MapStyleValueDefinition_dataType_get(swigCPtr, this));
+  }
+
+  public String getName() {
+    return OsmAndCoreJNI.MapStyleValueDefinition_name_get(swigCPtr, this);
+  }
+
+  public boolean getIsComplex() {
+    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;
+    }
+  }
+
+}

JNI/src/net/osmand/core/jni/MapStylesCollection.java

@@ -0,0 +1,61 @@
+/* ----------------------------------------------------------------------------
+ * 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 MapStylesCollection extends IMapStylesCollection {
+  private long swigCPtr;
+  private boolean swigCMemOwnDerived;
+
+  protected MapStylesCollection(long cPtr, boolean cMemoryOwn) {
+    super(OsmAndCoreJNI.MapStylesCollection_SWIGSmartPtrUpcast(cPtr), true);
+    swigCMemOwnDerived = cMemoryOwn;
+    swigCPtr = cPtr;
+  }
+
+  protected static long getCPtr(MapStylesCollection obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+
+  protected void finalize() {
+    delete();
+  }
+
+  public synchronized void delete() {
+    if (swigCPtr != 0) {
+      if (swigCMemOwnDerived) {
+        swigCMemOwnDerived = false;
+        OsmAndCoreJNI.delete_MapStylesCollection(swigCPtr);
+      }
+      swigCPtr = 0;
+    }
+    super.delete();
+  }
+
+  public MapStylesCollection() {
+    this(OsmAndCoreJNI.new_MapStylesCollection(), true);
+  }
+
+  public boolean addStyleFromFile(String filePath) {
+    return OsmAndCoreJNI.MapStylesCollection_addStyleFromFile(swigCPtr, this, filePath);
+  }
+
+  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 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 ResolvedMapStyle getResolvedStyleByName(String name) {
+    long cPtr = OsmAndCoreJNI.MapStylesCollection_getResolvedStyleByName(swigCPtr, this, name);
+    return (cPtr == 0) ? null : new ResolvedMapStyle(cPtr, true);
+  }
+
+}

JNI/src/net/osmand/core/jni/MapStylesPresetsCollection.java

@@ -0,0 +1,85 @@
+/* ----------------------------------------------------------------------------
+ * 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 MapStylesPresetsCollection extends IMapStylesPresetsCollection {
+  private long swigCPtr;
+  private boolean swigCMemOwnDerived;
+
+  protected MapStylesPresetsCollection(long cPtr, boolean cMemoryOwn) {
+    super(OsmAndCoreJNI.MapStylesPresetsCollection_SWIGSmartPtrUpcast(cPtr), true);
+    swigCMemOwnDerived = cMemoryOwn;
+    swigCPtr = cPtr;
+  }
+
+  protected static long getCPtr(MapStylesPresetsCollection obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+
+  protected void finalize() {
+    delete();
+  }
+
+  public synchronized void delete() {
+    if (swigCPtr != 0) {
+      if (swigCMemOwnDerived) {
+        swigCMemOwnDerived = false;
+        OsmAndCoreJNI.delete_MapStylesPresetsCollection(swigCPtr);
+      }
+      swigCPtr = 0;
+    }
+    super.delete();
+  }
+
+  public MapStylesPresetsCollection() {
+    this(OsmAndCoreJNI.new_MapStylesPresetsCollection(), true);
+  }
+
+  public boolean loadFrom(SWIGTYPE_p_QByteArray content) {
+    return OsmAndCoreJNI.MapStylesPresetsCollection_loadFrom__SWIG_0(swigCPtr, this, SWIGTYPE_p_QByteArray.getCPtr(content));
+  }
+
+  public boolean loadFrom(SWIGTYPE_p_QIODevice ioDevice) {
+    return OsmAndCoreJNI.MapStylesPresetsCollection_loadFrom__SWIG_1(swigCPtr, this, SWIGTYPE_p_QIODevice.getCPtr(ioDevice));
+  }
+
+  public boolean loadFrom(String fileName) {
+    return OsmAndCoreJNI.MapStylesPresetsCollection_loadFrom__SWIG_2(swigCPtr, this, fileName);
+  }
+
+  public boolean saveTo(SWIGTYPE_p_QIODevice ioDevice) {
+    return OsmAndCoreJNI.MapStylesPresetsCollection_saveTo__SWIG_0(swigCPtr, this, SWIGTYPE_p_QIODevice.getCPtr(ioDevice));
+  }
+
+  public boolean saveTo(String fileName) {
+    return OsmAndCoreJNI.MapStylesPresetsCollection_saveTo__SWIG_1(swigCPtr, this, fileName);
+  }
+
+  public boolean addPreset(MapStylePreset preset) {
+    return OsmAndCoreJNI.MapStylesPresetsCollection_addPreset(swigCPtr, this, MapStylePreset.getCPtr(preset), preset);
+  }
+
+  public boolean removePreset(MapStylePreset preset) {
+    return OsmAndCoreJNI.MapStylesPresetsCollection_removePreset(swigCPtr, this, MapStylePreset.getCPtr(preset), preset);
+  }
+
+  public SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__MapStylePreset_const_t_t getCollection() {
+    return new SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__MapStylePreset_const_t_t(OsmAndCoreJNI.MapStylesPresetsCollection_getCollection__SWIG_0(swigCPtr, this), true);
+  }
+
+  public SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__MapStylePreset_const_t_t getCollectionFor(String styleName) {
+    return new SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__MapStylePreset_const_t_t(OsmAndCoreJNI.MapStylesPresetsCollection_getCollectionFor__SWIG_0(swigCPtr, this, styleName), true);
+  }
+
+  public MapStylePreset getPreset(String styleName, String presetName) {
+    long cPtr = OsmAndCoreJNI.MapStylesPresetsCollection_getPreset__SWIG_0(swigCPtr, this, styleName, presetName);
+    return (cPtr == 0) ? null : new MapStylePreset(cPtr, true);
+  }
+
+}

JNI/src/net/osmand/core/jni/MapSymbol.java

@@ -0,0 +1,136 @@
+/* ----------------------------------------------------------------------------
+ * 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 MapSymbol {
+  private long swigCPtr;
+  private boolean swigCMemOwn;
+
+  protected MapSymbol(long cPtr, boolean cMemoryOwn) {
+    swigCMemOwn = cMemoryOwn;
+    swigCPtr = cPtr;
+  }
+
+  protected static long getCPtr(MapSymbol obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+
+  protected void finalize() {
+    delete();
+  }
+
+  public synchronized void delete() {
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        OsmAndCoreJNI.delete_MapSymbol(swigCPtr);
+      }
+      swigCPtr = 0;
+    }
+  }
+
+  public SWIGTYPE_p_std__weak_ptrT_OsmAnd__MapSymbolsGroup_t getGroup() {
+    long cPtr = OsmAndCoreJNI.MapSymbol_group_get(swigCPtr, this);
+    return (cPtr == 0) ? null : new SWIGTYPE_p_std__weak_ptrT_OsmAnd__MapSymbolsGroup_t(cPtr, false);
+  }
+
+  public MapSymbolsGroup getGroupPtr() {
+    long cPtr = OsmAndCoreJNI.MapSymbol_groupPtr_get(swigCPtr, this);
+    return (cPtr == 0) ? null : new MapSymbolsGroup(cPtr, true);
+  }
+
+  public boolean getIsShareable() {
+    return OsmAndCoreJNI.MapSymbol_isShareable_get(swigCPtr, this);
+  }
+
+  public void setOrder(int value) {
+    OsmAndCoreJNI.MapSymbol_order_set(swigCPtr, this, value);
+  }
+
+  public int getOrder() {
+    return OsmAndCoreJNI.MapSymbol_order_get(swigCPtr, this);
+  }
+
+  public void setContentClass(MapSymbol.ContentClass value) {
+    OsmAndCoreJNI.MapSymbol_contentClass_set(swigCPtr, this, value.swigValue());
+  }
+
+  public MapSymbol.ContentClass getContentClass() {
+    return MapSymbol.ContentClass.swigToEnum(OsmAndCoreJNI.MapSymbol_contentClass_get(swigCPtr, this));
+  }
+
+  public void setIntersectsWithClasses(SWIGTYPE_p_QSetT_int_t value) {
+    OsmAndCoreJNI.MapSymbol_intersectsWithClasses_set(swigCPtr, this, SWIGTYPE_p_QSetT_int_t.getCPtr(value));
+  }
+
+  public SWIGTYPE_p_QSetT_int_t getIntersectsWithClasses() {
+    return new SWIGTYPE_p_QSetT_int_t(OsmAndCoreJNI.MapSymbol_intersectsWithClasses_get(swigCPtr, this), true);
+  }
+
+  public void setIsHidden(boolean value) {
+    OsmAndCoreJNI.MapSymbol_isHidden_set(swigCPtr, this, value);
+  }
+
+  public boolean getIsHidden() {
+    return OsmAndCoreJNI.MapSymbol_isHidden_get(swigCPtr, this);
+  }
+
+  public void setModulationColor(FColorARGB value) {
+    OsmAndCoreJNI.MapSymbol_modulationColor_set(swigCPtr, this, FColorARGB.getCPtr(value), value);
+  }
+
+  public FColorARGB getModulationColor() {
+    long cPtr = OsmAndCoreJNI.MapSymbol_modulationColor_get(swigCPtr, this);
+    return (cPtr == 0) ? null : new FColorARGB(cPtr, false);
+  }
+
+  public enum ContentClass {
+    Unknown(OsmAndCoreJNI.MapSymbol_ContentClass_Unknown_get()),
+    Icon,
+    Caption;
+
+    public final int swigValue() {
+      return swigValue;
+    }
+
+    public static ContentClass swigToEnum(int swigValue) {
+      ContentClass[] swigValues = ContentClass.class.getEnumConstants();
+      if (swigValue < swigValues.length && swigValue >= 0 && swigValues[swigValue].swigValue == swigValue)
+        return swigValues[swigValue];
+      for (ContentClass swigEnum : swigValues)
+        if (swigEnum.swigValue == swigValue)
+          return swigEnum;
+      throw new IllegalArgumentException("No enum " + ContentClass.class + " with value " + swigValue);
+    }
+
+    @SuppressWarnings("unused")
+    private ContentClass() {
+      this.swigValue = SwigNext.next++;
+    }
+
+    @SuppressWarnings("unused")
+    private ContentClass(int swigValue) {
+      this.swigValue = swigValue;
+      SwigNext.next = swigValue+1;
+    }
+
+    @SuppressWarnings("unused")
+    private ContentClass(ContentClass swigEnum) {
+      this.swigValue = swigEnum.swigValue;
+      SwigNext.next = this.swigValue+1;
+    }
+
+    private final int swigValue;
+
+    private static class SwigNext {
+      private static int next = 0;
+    }
+  }
+
+}

JNI/src/net/osmand/core/jni/MapSymbolsGroup.java

@@ -0,0 +1,461 @@
+/* ----------------------------------------------------------------------------
+ * 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 MapSymbolsGroup {
+  private long swigCPtr;
+  private boolean swigCMemOwn;
+
+  protected MapSymbolsGroup(long cPtr, boolean cMemoryOwn) {
+    swigCMemOwn = cMemoryOwn;
+    swigCPtr = cPtr;
+  }
+
+  protected static long getCPtr(MapSymbolsGroup obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+
+  protected void finalize() {
+    delete();
+  }
+
+  public synchronized void delete() {
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        OsmAndCoreJNI.delete_MapSymbolsGroup(swigCPtr);
+      }
+      swigCPtr = 0;
+    }
+  }
+
+  static public class AdditionalInstance {
+    private long swigCPtr;
+    protected boolean swigCMemOwn;
+  
+    protected AdditionalInstance(long cPtr, boolean cMemoryOwn) {
+      swigCMemOwn = cMemoryOwn;
+      swigCPtr = cPtr;
+    }
+  
+    protected static long getCPtr(AdditionalInstance obj) {
+      return (obj == null) ? 0 : obj.swigCPtr;
+    }
+  
+    protected void finalize() {
+      delete();
+    }
+  
+    public synchronized void delete() {
+      if (swigCPtr != 0) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          OsmAndCoreJNI.delete_MapSymbolsGroup_AdditionalInstance(swigCPtr);
+        }
+        swigCPtr = 0;
+      }
+    }
+  
+    public AdditionalInstance(MapSymbolsGroup originalGroup) {
+      this(OsmAndCoreJNI.new_MapSymbolsGroup_AdditionalInstance(MapSymbolsGroup.getCPtr(originalGroup), originalGroup), true);
+    }
+  
+    public SWIGTYPE_p_std__weak_ptrT_OsmAnd__MapSymbolsGroup_t getOriginalGroup() {
+      long cPtr = OsmAndCoreJNI.MapSymbolsGroup_AdditionalInstance_originalGroup_get(swigCPtr, this);
+      return (cPtr == 0) ? null : new SWIGTYPE_p_std__weak_ptrT_OsmAnd__MapSymbolsGroup_t(cPtr, false);
+    }
+  
+    public void setSymbols(SWIGTYPE_p_QHashT_std__shared_ptrT_OsmAnd__MapSymbol_t_std__shared_ptrT_OsmAnd__MapSymbolsGroup__AdditionalSymbolInstanceParameters_t_t value) {
+      OsmAndCoreJNI.MapSymbolsGroup_AdditionalInstance_symbols_set(swigCPtr, this, SWIGTYPE_p_QHashT_std__shared_ptrT_OsmAnd__MapSymbol_t_std__shared_ptrT_OsmAnd__MapSymbolsGroup__AdditionalSymbolInstanceParameters_t_t.getCPtr(value));
+    }
+  
+    public SWIGTYPE_p_QHashT_std__shared_ptrT_OsmAnd__MapSymbol_t_std__shared_ptrT_OsmAnd__MapSymbolsGroup__AdditionalSymbolInstanceParameters_t_t getSymbols() {
+      long cPtr = OsmAndCoreJNI.MapSymbolsGroup_AdditionalInstance_symbols_get(swigCPtr, this);
+      return (cPtr == 0) ? null : new SWIGTYPE_p_QHashT_std__shared_ptrT_OsmAnd__MapSymbol_t_std__shared_ptrT_OsmAnd__MapSymbolsGroup__AdditionalSymbolInstanceParameters_t_t(cPtr, false);
+    }
+  
+    public MapSymbol getFirstSymbolWithContentClass(MapSymbol.ContentClass contentClass) {
+      long cPtr = OsmAndCoreJNI.MapSymbolsGroup_AdditionalInstance_getFirstSymbolWithContentClass(swigCPtr, this, contentClass.swigValue());
+      return (cPtr == 0) ? null : new MapSymbol(cPtr, true);
+    }
+  
+    public long numberOfSymbolsWithContentClass(MapSymbol.ContentClass contentClass) {
+      return OsmAndCoreJNI.MapSymbolsGroup_AdditionalInstance_numberOfSymbolsWithContentClass(swigCPtr, this, contentClass.swigValue());
+    }
+  
+  }
+
+  static public class AdditionalSymbolInstanceParameters {
+    private long swigCPtr;
+    protected boolean swigCMemOwn;
+  
+    protected AdditionalSymbolInstanceParameters(long cPtr, boolean cMemoryOwn) {
+      swigCMemOwn = cMemoryOwn;
+      swigCPtr = cPtr;
+    }
+  
+    protected static long getCPtr(AdditionalSymbolInstanceParameters obj) {
+      return (obj == null) ? 0 : obj.swigCPtr;
+    }
+  
+    protected void finalize() {
+      delete();
+    }
+  
+    public synchronized void delete() {
+      if (swigCPtr != 0) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          OsmAndCoreJNI.delete_MapSymbolsGroup_AdditionalSymbolInstanceParameters(swigCPtr);
+        }
+        swigCPtr = 0;
+      }
+    }
+  
+    public AdditionalSymbolInstanceParameters(MapSymbolsGroup.AdditionalInstance groupInstancePtr) {
+      this(OsmAndCoreJNI.new_MapSymbolsGroup_AdditionalSymbolInstanceParameters(MapSymbolsGroup.AdditionalInstance.getCPtr(groupInstancePtr), groupInstancePtr), true);
+    }
+  
+    public MapSymbolsGroup.AdditionalInstance getGroupInstancePtr() {
+      long cPtr = OsmAndCoreJNI.MapSymbolsGroup_AdditionalSymbolInstanceParameters_groupInstancePtr_get(swigCPtr, this);
+      return (cPtr == 0) ? null : new MapSymbolsGroup.AdditionalInstance(cPtr, false);
+    }
+  
+  }
+
+  static public class AdditionalBillboardSymbolInstanceParameters extends MapSymbolsGroup.AdditionalSymbolInstanceParameters {
+    private long swigCPtr;
+  
+    protected AdditionalBillboardSymbolInstanceParameters(long cPtr, boolean cMemoryOwn) {
+      super(OsmAndCoreJNI.MapSymbolsGroup_AdditionalBillboardSymbolInstanceParameters_SWIGUpcast(cPtr), cMemoryOwn);
+      swigCPtr = cPtr;
+    }
+  
+    protected static long getCPtr(AdditionalBillboardSymbolInstanceParameters obj) {
+      return (obj == null) ? 0 : obj.swigCPtr;
+    }
+  
+    protected void finalize() {
+      delete();
+    }
+  
+    public synchronized void delete() {
+      if (swigCPtr != 0) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          OsmAndCoreJNI.delete_MapSymbolsGroup_AdditionalBillboardSymbolInstanceParameters(swigCPtr);
+        }
+        swigCPtr = 0;
+      }
+      super.delete();
+    }
+  
+    public AdditionalBillboardSymbolInstanceParameters(MapSymbolsGroup.AdditionalInstance groupInstancePtr) {
+      this(OsmAndCoreJNI.new_MapSymbolsGroup_AdditionalBillboardSymbolInstanceParameters(MapSymbolsGroup.AdditionalInstance.getCPtr(groupInstancePtr), groupInstancePtr), true);
+    }
+  
+    public void setOverridesPosition31(boolean value) {
+      OsmAndCoreJNI.MapSymbolsGroup_AdditionalBillboardSymbolInstanceParameters_overridesPosition31_set(swigCPtr, this, value);
+    }
+  
+    public boolean getOverridesPosition31() {
+      return OsmAndCoreJNI.MapSymbolsGroup_AdditionalBillboardSymbolInstanceParameters_overridesPosition31_get(swigCPtr, this);
+    }
+  
+    public void setPosition31(PointI value) {
+      OsmAndCoreJNI.MapSymbolsGroup_AdditionalBillboardSymbolInstanceParameters_position31_set(swigCPtr, this, PointI.getCPtr(value), value);
+    }
+  
+    public PointI getPosition31() {
+      long cPtr = OsmAndCoreJNI.MapSymbolsGroup_AdditionalBillboardSymbolInstanceParameters_position31_get(swigCPtr, this);
+      return (cPtr == 0) ? null : new PointI(cPtr, false);
+    }
+  
+    public void setOverridesOffset(boolean value) {
+      OsmAndCoreJNI.MapSymbolsGroup_AdditionalBillboardSymbolInstanceParameters_overridesOffset_set(swigCPtr, this, value);
+    }
+  
+    public boolean getOverridesOffset() {
+      return OsmAndCoreJNI.MapSymbolsGroup_AdditionalBillboardSymbolInstanceParameters_overridesOffset_get(swigCPtr, this);
+    }
+  
+    public void setOffset(PointI value) {
+      OsmAndCoreJNI.MapSymbolsGroup_AdditionalBillboardSymbolInstanceParameters_offset_set(swigCPtr, this, PointI.getCPtr(value), value);
+    }
+  
+    public PointI getOffset() {
+      long cPtr = OsmAndCoreJNI.MapSymbolsGroup_AdditionalBillboardSymbolInstanceParameters_offset_get(swigCPtr, this);
+      return (cPtr == 0) ? null : new PointI(cPtr, false);
+    }
+  
+  }
+
+  static public class AdditionalOnSurfaceSymbolInstanceParameters extends MapSymbolsGroup.AdditionalSymbolInstanceParameters {
+    private long swigCPtr;
+  
+    protected AdditionalOnSurfaceSymbolInstanceParameters(long cPtr, boolean cMemoryOwn) {
+      super(OsmAndCoreJNI.MapSymbolsGroup_AdditionalOnSurfaceSymbolInstanceParameters_SWIGUpcast(cPtr), cMemoryOwn);
+      swigCPtr = cPtr;
+    }
+  
+    protected static long getCPtr(AdditionalOnSurfaceSymbolInstanceParameters obj) {
+      return (obj == null) ? 0 : obj.swigCPtr;
+    }
+  
+    protected void finalize() {
+      delete();
+    }
+  
+    public synchronized void delete() {
+      if (swigCPtr != 0) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          OsmAndCoreJNI.delete_MapSymbolsGroup_AdditionalOnSurfaceSymbolInstanceParameters(swigCPtr);
+        }
+        swigCPtr = 0;
+      }
+      super.delete();
+    }
+  
+    public AdditionalOnSurfaceSymbolInstanceParameters(MapSymbolsGroup.AdditionalInstance groupInstancePtr) {
+      this(OsmAndCoreJNI.new_MapSymbolsGroup_AdditionalOnSurfaceSymbolInstanceParameters(MapSymbolsGroup.AdditionalInstance.getCPtr(groupInstancePtr), groupInstancePtr), true);
+    }
+  
+    public void setOverridesPosition31(boolean value) {
+      OsmAndCoreJNI.MapSymbolsGroup_AdditionalOnSurfaceSymbolInstanceParameters_overridesPosition31_set(swigCPtr, this, value);
+    }
+  
+    public boolean getOverridesPosition31() {
+      return OsmAndCoreJNI.MapSymbolsGroup_AdditionalOnSurfaceSymbolInstanceParameters_overridesPosition31_get(swigCPtr, this);
+    }
+  
+    public void setPosition31(PointI value) {
+      OsmAndCoreJNI.MapSymbolsGroup_AdditionalOnSurfaceSymbolInstanceParameters_position31_set(swigCPtr, this, PointI.getCPtr(value), value);
+    }
+  
+    public PointI getPosition31() {
+      long cPtr = OsmAndCoreJNI.MapSymbolsGroup_AdditionalOnSurfaceSymbolInstanceParameters_position31_get(swigCPtr, this);
+      return (cPtr == 0) ? null : new PointI(cPtr, false);
+    }
+  
+    public void setOverridesDirection(boolean value) {
+      OsmAndCoreJNI.MapSymbolsGroup_AdditionalOnSurfaceSymbolInstanceParameters_overridesDirection_set(swigCPtr, this, value);
+    }
+  
+    public boolean getOverridesDirection() {
+      return OsmAndCoreJNI.MapSymbolsGroup_AdditionalOnSurfaceSymbolInstanceParameters_overridesDirection_get(swigCPtr, this);
+    }
+  
+    public void setDirection(float value) {
+      OsmAndCoreJNI.MapSymbolsGroup_AdditionalOnSurfaceSymbolInstanceParameters_direction_set(swigCPtr, this, value);
+    }
+  
+    public float getDirection() {
+      return OsmAndCoreJNI.MapSymbolsGroup_AdditionalOnSurfaceSymbolInstanceParameters_direction_get(swigCPtr, this);
+    }
+  
+  }
+
+  static public class AdditionalOnPathSymbolInstanceParameters extends MapSymbolsGroup.AdditionalSymbolInstanceParameters {
+    private long swigCPtr;
+  
+    protected AdditionalOnPathSymbolInstanceParameters(long cPtr, boolean cMemoryOwn) {
+      super(OsmAndCoreJNI.MapSymbolsGroup_AdditionalOnPathSymbolInstanceParameters_SWIGUpcast(cPtr), cMemoryOwn);
+      swigCPtr = cPtr;
+    }
+  
+    protected static long getCPtr(AdditionalOnPathSymbolInstanceParameters obj) {
+      return (obj == null) ? 0 : obj.swigCPtr;
+    }
+  
+    protected void finalize() {
+      delete();
+    }
+  
+    public synchronized void delete() {
+      if (swigCPtr != 0) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          OsmAndCoreJNI.delete_MapSymbolsGroup_AdditionalOnPathSymbolInstanceParameters(swigCPtr);
+        }
+        swigCPtr = 0;
+      }
+      super.delete();
+    }
+  
+    public AdditionalOnPathSymbolInstanceParameters(MapSymbolsGroup.AdditionalInstance groupInstancePtr) {
+      this(OsmAndCoreJNI.new_MapSymbolsGroup_AdditionalOnPathSymbolInstanceParameters(MapSymbolsGroup.AdditionalInstance.getCPtr(groupInstancePtr), groupInstancePtr), true);
+    }
+  
+    public void setOverridesPinPointOnPath(boolean value) {
+      OsmAndCoreJNI.MapSymbolsGroup_AdditionalOnPathSymbolInstanceParameters_overridesPinPointOnPath_set(swigCPtr, this, value);
+    }
+  
+    public boolean getOverridesPinPointOnPath() {
+      return OsmAndCoreJNI.MapSymbolsGroup_AdditionalOnPathSymbolInstanceParameters_overridesPinPointOnPath_get(swigCPtr, this);
+    }
+  
+    public void setPinPointOnPath(SWIGTYPE_p_IOnPathMapSymbol__PinPoint value) {
+      OsmAndCoreJNI.MapSymbolsGroup_AdditionalOnPathSymbolInstanceParameters_pinPointOnPath_set(swigCPtr, this, SWIGTYPE_p_IOnPathMapSymbol__PinPoint.getCPtr(value));
+    }
+  
+    public SWIGTYPE_p_IOnPathMapSymbol__PinPoint getPinPointOnPath() {
+      return new SWIGTYPE_p_IOnPathMapSymbol__PinPoint(OsmAndCoreJNI.MapSymbolsGroup_AdditionalOnPathSymbolInstanceParameters_pinPointOnPath_get(swigCPtr, this), true);
+    }
+  
+  }
+
+  public MapSymbolsGroup() {
+    this(OsmAndCoreJNI.new_MapSymbolsGroup(), true);
+  }
+
+  public void setPresentationMode(SWIGTYPE_p_OsmAnd__BitmaskT_OsmAnd__MapSymbolsGroup__PresentationModeFlag_unsigned_int_t value) {
+    OsmAndCoreJNI.MapSymbolsGroup_presentationMode_set(swigCPtr, this, SWIGTYPE_p_OsmAnd__BitmaskT_OsmAnd__MapSymbolsGroup__PresentationModeFlag_unsigned_int_t.getCPtr(value));
+  }
+
+  public SWIGTYPE_p_OsmAnd__BitmaskT_OsmAnd__MapSymbolsGroup__PresentationModeFlag_unsigned_int_t getPresentationMode() {
+    long cPtr = OsmAndCoreJNI.MapSymbolsGroup_presentationMode_get(swigCPtr, this);
+    return (cPtr == 0) ? null : new SWIGTYPE_p_OsmAnd__BitmaskT_OsmAnd__MapSymbolsGroup__PresentationModeFlag_unsigned_int_t(cPtr, false);
+  }
+
+  public void setIntersectionProcessingMode(SWIGTYPE_p_OsmAnd__BitmaskT_OsmAnd__MapSymbolsGroup__IntersectionProcessingModeFlag_unsigned_int_t value) {
+    OsmAndCoreJNI.MapSymbolsGroup_intersectionProcessingMode_set(swigCPtr, this, SWIGTYPE_p_OsmAnd__BitmaskT_OsmAnd__MapSymbolsGroup__IntersectionProcessingModeFlag_unsigned_int_t.getCPtr(value));
+  }
+
+  public SWIGTYPE_p_OsmAnd__BitmaskT_OsmAnd__MapSymbolsGroup__IntersectionProcessingModeFlag_unsigned_int_t getIntersectionProcessingMode() {
+    long cPtr = OsmAndCoreJNI.MapSymbolsGroup_intersectionProcessingMode_get(swigCPtr, this);
+    return (cPtr == 0) ? null : new SWIGTYPE_p_OsmAnd__BitmaskT_OsmAnd__MapSymbolsGroup__IntersectionProcessingModeFlag_unsigned_int_t(cPtr, false);
+  }
+
+  public void setSymbols(SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__MapSymbol_t_t value) {
+    OsmAndCoreJNI.MapSymbolsGroup_symbols_set(swigCPtr, this, SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__MapSymbol_t_t.getCPtr(value));
+  }
+
+  public SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__MapSymbol_t_t getSymbols() {
+    long cPtr = OsmAndCoreJNI.MapSymbolsGroup_symbols_get(swigCPtr, this);
+    return (cPtr == 0) ? null : new SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__MapSymbol_t_t(cPtr, false);
+  }
+
+  public MapSymbol getFirstSymbolWithContentClass(MapSymbol.ContentClass contentClass) {
+    long cPtr = OsmAndCoreJNI.MapSymbolsGroup_getFirstSymbolWithContentClass(swigCPtr, this, contentClass.swigValue());
+    return (cPtr == 0) ? null : new MapSymbol(cPtr, true);
+  }
+
+  public long numberOfSymbolsWithContentClass(MapSymbol.ContentClass contentClass) {
+    return OsmAndCoreJNI.MapSymbolsGroup_numberOfSymbolsWithContentClass(swigCPtr, this, contentClass.swigValue());
+  }
+
+  public String getDebugTitle() {
+    return OsmAndCoreJNI.MapSymbolsGroup_getDebugTitle(swigCPtr, this);
+  }
+
+  public void setAdditionalInstancesDiscardOriginal(boolean value) {
+    OsmAndCoreJNI.MapSymbolsGroup_additionalInstancesDiscardOriginal_set(swigCPtr, this, value);
+  }
+
+  public boolean getAdditionalInstancesDiscardOriginal() {
+    return OsmAndCoreJNI.MapSymbolsGroup_additionalInstancesDiscardOriginal_get(swigCPtr, this);
+  }
+
+  public void setAdditionalInstances(SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__MapSymbolsGroup__AdditionalInstance_t_t value) {
+    OsmAndCoreJNI.MapSymbolsGroup_additionalInstances_set(swigCPtr, this, SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__MapSymbolsGroup__AdditionalInstance_t_t.getCPtr(value));
+  }
+
+  public SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__MapSymbolsGroup__AdditionalInstance_t_t getAdditionalInstances() {
+    long cPtr = OsmAndCoreJNI.MapSymbolsGroup_additionalInstances_get(swigCPtr, this);
+    return (cPtr == 0) ? null : new SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__MapSymbolsGroup__AdditionalInstance_t_t(cPtr, false);
+  }
+
+  public enum PresentationModeFlag {
+    ShowAnything(OsmAndCoreJNI.MapSymbolsGroup_PresentationModeFlag_ShowAnything_get()),
+    ShowAllOrNothing,
+    ShowAllCaptionsOrNoCaptions,
+    ShowNoneIfIconIsNotShown,
+    CheckIntersectionsWithinGroup;
+
+    public final int swigValue() {
+      return swigValue;
+    }
+
+    public static PresentationModeFlag swigToEnum(int swigValue) {
+      PresentationModeFlag[] swigValues = PresentationModeFlag.class.getEnumConstants();
+      if (swigValue < swigValues.length && swigValue >= 0 && swigValues[swigValue].swigValue == swigValue)
+        return swigValues[swigValue];
+      for (PresentationModeFlag swigEnum : swigValues)
+        if (swigEnum.swigValue == swigValue)
+          return swigEnum;
+      throw new IllegalArgumentException("No enum " + PresentationModeFlag.class + " with value " + swigValue);
+    }
+
+    @SuppressWarnings("unused")
+    private PresentationModeFlag() {
+      this.swigValue = SwigNext.next++;
+    }
+
+    @SuppressWarnings("unused")
+    private PresentationModeFlag(int swigValue) {
+      this.swigValue = swigValue;
+      SwigNext.next = swigValue+1;
+    }
+
+    @SuppressWarnings("unused")
+    private PresentationModeFlag(PresentationModeFlag swigEnum) {
+      this.swigValue = swigEnum.swigValue;
+      SwigNext.next = this.swigValue+1;
+    }
+
+    private final int swigValue;
+
+    private static class SwigNext {
+      private static int next = 0;
+    }
+  }
+
+  public enum IntersectionProcessingModeFlag {
+    CheckIntersectionsWithinGroup(OsmAndCoreJNI.MapSymbolsGroup_IntersectionProcessingModeFlag_CheckIntersectionsWithinGroup_get());
+
+    public final int swigValue() {
+      return swigValue;
+    }
+
+    public static IntersectionProcessingModeFlag swigToEnum(int swigValue) {
+      IntersectionProcessingModeFlag[] swigValues = IntersectionProcessingModeFlag.class.getEnumConstants();
+      if (swigValue < swigValues.length && swigValue >= 0 && swigValues[swigValue].swigValue == swigValue)
+        return swigValues[swigValue];
+      for (IntersectionProcessingModeFlag swigEnum : swigValues)
+        if (swigEnum.swigValue == swigValue)
+          return swigEnum;
+      throw new IllegalArgumentException("No enum " + IntersectionProcessingModeFlag.class + " with value " + swigValue);
+    }
+
+    @SuppressWarnings("unused")
+    private IntersectionProcessingModeFlag() {
+      this.swigValue = SwigNext.next++;
+    }
+
+    @SuppressWarnings("unused")
+    private IntersectionProcessingModeFlag(int swigValue) {
+      this.swigValue = swigValue;
+      SwigNext.next = swigValue+1;
+    }
+
+    @SuppressWarnings("unused")
+    private IntersectionProcessingModeFlag(IntersectionProcessingModeFlag swigEnum) {
+      this.swigValue = swigEnum.swigValue;
+      SwigNext.next = this.swigValue+1;
+    }
+
+    private final int swigValue;
+
+    private static class SwigNext {
+      private static int next = 0;
+    }
+  }
+
+}

JNI/src/net/osmand/core/jni/MapTiledData.java

@@ -0,0 +1,49 @@
+/* ----------------------------------------------------------------------------
+ * 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 MapTiledData extends MapData {
+  private long swigCPtr;
+  private boolean swigCMemOwnDerived;
+
+  protected MapTiledData(long cPtr, boolean cMemoryOwn) {
+    super(OsmAndCoreJNI.MapTiledData_SWIGSmartPtrUpcast(cPtr), true);
+    swigCMemOwnDerived = cMemoryOwn;
+    swigCPtr = cPtr;
+  }
+
+  protected static long getCPtr(MapTiledData obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+
+  protected void finalize() {
+    delete();
+  }
+
+  public synchronized void delete() {
+    if (swigCPtr != 0) {
+      if (swigCMemOwnDerived) {
+        swigCMemOwnDerived = false;
+        OsmAndCoreJNI.delete_MapTiledData(swigCPtr);
+      }
+      swigCPtr = 0;
+    }
+    super.delete();
+  }
+
+  public TileId getTileId() {
+    long cPtr = OsmAndCoreJNI.MapTiledData_tileId_get(swigCPtr, this);
+    return (cPtr == 0) ? null : new TileId(cPtr, false);
+  }
+
+  public ZoomLevel getZoom() {
+    return ZoomLevel.swigToEnum(OsmAndCoreJNI.MapTiledData_zoom_get(swigCPtr, this));
+  }
+
+}

JNI/src/net/osmand/core/jni/OOBBD.java

@@ -0,0 +1,74 @@
+/* ----------------------------------------------------------------------------
+ * 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 OOBBD {
+  private long swigCPtr;
+  protected boolean swigCMemOwn;
+
+  protected OOBBD(long cPtr, boolean cMemoryOwn) {
+    swigCMemOwn = cMemoryOwn;
+    swigCPtr = cPtr;
+  }
+
+  protected static long getCPtr(OOBBD obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+
+  protected void finalize() {
+    delete();
+  }
+
+  public synchronized void delete() {
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        OsmAndCoreJNI.delete_OOBBD(swigCPtr);
+      }
+      swigCPtr = 0;
+    }
+  }
+
+  public OOBBD() {
+    this(OsmAndCoreJNI.new_OOBBD__SWIG_0(), true);
+  }
+
+  public OOBBD(AreaD bboxInObjectSpace_, float rotation_) {
+    this(OsmAndCoreJNI.new_OOBBD__SWIG_1(AreaD.getCPtr(bboxInObjectSpace_), bboxInObjectSpace_, rotation_), true);
+  }
+
+  public boolean contains(OOBBD that) {
+    return OsmAndCoreJNI.OOBBD_contains__SWIG_0(swigCPtr, this, OOBBD.getCPtr(that), that);
+  }
+
+  public boolean intersects(OOBBD that) {
+    return OsmAndCoreJNI.OOBBD_intersects__SWIG_0(swigCPtr, this, OOBBD.getCPtr(that), that);
+  }
+
+  public boolean contains(AreaD area) {
+    return OsmAndCoreJNI.OOBBD_contains__SWIG_1(swigCPtr, this, AreaD.getCPtr(area), area);
+  }
+
+  public boolean contains(PointD point) {
+    return OsmAndCoreJNI.OOBBD_contains__SWIG_2(swigCPtr, this, PointD.getCPtr(point), point);
+  }
+
+  public boolean intersects(AreaD that) {
+    return OsmAndCoreJNI.OOBBD_intersects__SWIG_1(swigCPtr, this, AreaD.getCPtr(that), that);
+  }
+
+  public OOBBD getEnlargedBy(PointD delta) {
+    return new OOBBD(OsmAndCoreJNI.OOBBD_getEnlargedBy__SWIG_0(swigCPtr, this, PointD.getCPtr(delta), delta), true);
+  }
+
+  public OOBBD getEnlargedBy(double dt, double dl, double db, double dr) {
+    return new OOBBD(OsmAndCoreJNI.OOBBD_getEnlargedBy__SWIG_1(swigCPtr, this, dt, dl, db, dr), true);
+  }
+
+}

JNI/src/net/osmand/core/jni/OOBBF.java

@@ -0,0 +1,74 @@
+/* ----------------------------------------------------------------------------
+ * 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 OOBBF {
+  private long swigCPtr;
+  protected boolean swigCMemOwn;
+
+  protected OOBBF(long cPtr, boolean cMemoryOwn) {
+    swigCMemOwn = cMemoryOwn;
+    swigCPtr = cPtr;
+  }
+
+  protected static long getCPtr(OOBBF obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+
+  protected void finalize() {
+    delete();
+  }
+
+  public synchronized void delete() {
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        OsmAndCoreJNI.delete_OOBBF(swigCPtr);
+      }
+      swigCPtr = 0;
+    }
+  }
+
+  public OOBBF() {
+    this(OsmAndCoreJNI.new_OOBBF__SWIG_0(), true);
+  }
+
+  public OOBBF(AreaF bboxInObjectSpace_, float rotation_) {
+    this(OsmAndCoreJNI.new_OOBBF__SWIG_1(AreaF.getCPtr(bboxInObjectSpace_), bboxInObjectSpace_, rotation_), true);
+  }
+
+  public boolean contains(OOBBF that) {
+    return OsmAndCoreJNI.OOBBF_contains__SWIG_0(swigCPtr, this, OOBBF.getCPtr(that), that);
+  }
+
+  public boolean intersects(OOBBF that) {
+    return OsmAndCoreJNI.OOBBF_intersects__SWIG_0(swigCPtr, this, OOBBF.getCPtr(that), that);
+  }
+
+  public boolean contains(AreaF area) {
+    return OsmAndCoreJNI.OOBBF_contains__SWIG_1(swigCPtr, this, AreaF.getCPtr(area), area);
+  }
+
+  public boolean contains(PointF point) {
+    return OsmAndCoreJNI.OOBBF_contains__SWIG_2(swigCPtr, this, PointF.getCPtr(point), point);
+  }
+
+  public boolean intersects(AreaF that) {
+    return OsmAndCoreJNI.OOBBF_intersects__SWIG_1(swigCPtr, this, AreaF.getCPtr(that), that);
+  }
+
+  public OOBBF getEnlargedBy(PointF delta) {
+    return new OOBBF(OsmAndCoreJNI.OOBBF_getEnlargedBy__SWIG_0(swigCPtr, this, PointF.getCPtr(delta), delta), true);
+  }
+
+  public OOBBF getEnlargedBy(float dt, float dl, float db, float dr) {
+    return new OOBBF(OsmAndCoreJNI.OOBBF_getEnlargedBy__SWIG_1(swigCPtr, this, dt, dl, db, dr), true);
+  }
+
+}

JNI/src/net/osmand/core/jni/OOBBI.java

@@ -0,0 +1,74 @@
+/* ----------------------------------------------------------------------------
+ * 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 OOBBI {
+  private long swigCPtr;
+  protected boolean swigCMemOwn;
+
+  protected OOBBI(long cPtr, boolean cMemoryOwn) {
+    swigCMemOwn = cMemoryOwn;
+    swigCPtr = cPtr;
+  }
+
+  protected static long getCPtr(OOBBI obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+
+  protected void finalize() {
+    delete();
+  }
+
+  public synchronized void delete() {
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        OsmAndCoreJNI.delete_OOBBI(swigCPtr);
+      }
+      swigCPtr = 0;
+    }
+  }
+
+  public OOBBI() {
+    this(OsmAndCoreJNI.new_OOBBI__SWIG_0(), true);
+  }
+
+  public OOBBI(AreaI bboxInObjectSpace_, float rotation_) {
+    this(OsmAndCoreJNI.new_OOBBI__SWIG_1(AreaI.getCPtr(bboxInObjectSpace_), bboxInObjectSpace_, rotation_), true);
+  }
+
+  public boolean contains(OOBBI that) {
+    return OsmAndCoreJNI.OOBBI_contains__SWIG_0(swigCPtr, this, OOBBI.getCPtr(that), that);
+  }
+
+  public boolean intersects(OOBBI that) {
+    return OsmAndCoreJNI.OOBBI_intersects__SWIG_0(swigCPtr, this, OOBBI.getCPtr(that), that);
+  }
+
+  public boolean contains(AreaI area) {
+    return OsmAndCoreJNI.OOBBI_contains__SWIG_1(swigCPtr, this, AreaI.getCPtr(area), area);
+  }
+
+  public boolean contains(PointI point) {
+    return OsmAndCoreJNI.OOBBI_contains__SWIG_2(swigCPtr, this, PointI.getCPtr(point), point);
+  }
+
+  public boolean intersects(AreaI that) {
+    return OsmAndCoreJNI.OOBBI_intersects__SWIG_1(swigCPtr, this, AreaI.getCPtr(that), that);
+  }
+
+  public OOBBI getEnlargedBy(PointI delta) {
+    return new OOBBI(OsmAndCoreJNI.OOBBI_getEnlargedBy__SWIG_0(swigCPtr, this, PointI.getCPtr(delta), delta), true);
+  }
+
+  public OOBBI getEnlargedBy(int dt, int dl, int db, int dr) {
+    return new OOBBI(OsmAndCoreJNI.OOBBI_getEnlargedBy__SWIG_1(swigCPtr, this, dt, dl, db, dr), true);
+  }
+
+}

JNI/src/net/osmand/core/jni/ObfAddressBlockType.java

@@ -0,0 +1,53 @@
+/* ----------------------------------------------------------------------------
+ * 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 ObfAddressBlockType {
+  CitiesOrTowns(OsmAndCoreJNI.ObfAddressBlockType_CitiesOrTowns_get()),
+  Villages(OsmAndCoreJNI.ObfAddressBlockType_Villages_get()),
+  Postcodes(OsmAndCoreJNI.ObfAddressBlockType_Postcodes_get());
+
+  public final int swigValue() {
+    return swigValue;
+  }
+
+  public static ObfAddressBlockType swigToEnum(int swigValue) {
+    ObfAddressBlockType[] swigValues = ObfAddressBlockType.class.getEnumConstants();
+    if (swigValue < swigValues.length && swigValue >= 0 && swigValues[swigValue].swigValue == swigValue)
+      return swigValues[swigValue];
+    for (ObfAddressBlockType swigEnum : swigValues)
+      if (swigEnum.swigValue == swigValue)
+        return swigEnum;
+    throw new IllegalArgumentException("No enum " + ObfAddressBlockType.class + " with value " + swigValue);
+  }
+
+  @SuppressWarnings("unused")
+  private ObfAddressBlockType() {
+    this.swigValue = SwigNext.next++;
+  }
+
+  @SuppressWarnings("unused")
+  private ObfAddressBlockType(int swigValue) {
+    this.swigValue = swigValue;
+    SwigNext.next = swigValue+1;
+  }
+
+  @SuppressWarnings("unused")
+  private ObfAddressBlockType(ObfAddressBlockType swigEnum) {
+    this.swigValue = swigEnum.swigValue;
+    SwigNext.next = this.swigValue+1;
+  }
+
+  private final int swigValue;
+
+  private static class SwigNext {
+    private static int next = 0;
+  }
+}
+

JNI/src/net/osmand/core/jni/ObfDataInterface.java

@@ -0,0 +1,131 @@
+/* ----------------------------------------------------------------------------
+ * 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 ObfDataInterface {
+  private long swigCPtr;
+  private boolean swigCMemOwn;
+
+  protected ObfDataInterface(long cPtr, boolean cMemoryOwn) {
+    swigCMemOwn = cMemoryOwn;
+    swigCPtr = cPtr;
+  }
+
+  protected static long getCPtr(ObfDataInterface obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+
+  protected void finalize() {
+    delete();
+  }
+
+  public synchronized void delete() {
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        OsmAndCoreJNI.delete_ObfDataInterface(swigCPtr);
+      }
+      swigCPtr = 0;
+    }
+  }
+
+  public ObfDataInterface(SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__ObfReader_const_t_t obfReaders) {
+    this(OsmAndCoreJNI.new_ObfDataInterface(SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__ObfReader_const_t_t.getCPtr(obfReaders)), true);
+  }
+
+  public SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__ObfReader_const_t_t getObfReaders() {
+    long cPtr = OsmAndCoreJNI.ObfDataInterface_obfReaders_get(swigCPtr, this);
+    return (cPtr == 0) ? null : new SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__ObfReader_const_t_t(cPtr, false);
+  }
+
+  public boolean loadObfFiles(SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__ObfFile_const_t_t outFiles, SWIGTYPE_p_OsmAnd__IQueryController controller) {
+    return OsmAndCoreJNI.ObfDataInterface_loadObfFiles__SWIG_0(swigCPtr, this, SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__ObfFile_const_t_t.getCPtr(outFiles), SWIGTYPE_p_OsmAnd__IQueryController.getCPtr(controller));
+  }
+
+  public boolean loadObfFiles(SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__ObfFile_const_t_t outFiles) {
+    return OsmAndCoreJNI.ObfDataInterface_loadObfFiles__SWIG_1(swigCPtr, this, SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__ObfFile_const_t_t.getCPtr(outFiles));
+  }
+
+  public boolean loadObfFiles() {
+    return OsmAndCoreJNI.ObfDataInterface_loadObfFiles__SWIG_2(swigCPtr, this);
+  }
+
+  public boolean loadBasemapPresenceFlag(SWIGTYPE_p_bool outBasemapPresent, SWIGTYPE_p_OsmAnd__IQueryController controller) {
+    return OsmAndCoreJNI.ObfDataInterface_loadBasemapPresenceFlag__SWIG_0(swigCPtr, this, SWIGTYPE_p_bool.getCPtr(outBasemapPresent), SWIGTYPE_p_OsmAnd__IQueryController.getCPtr(controller));
+  }
+
+  public boolean loadBasemapPresenceFlag(SWIGTYPE_p_bool outBasemapPresent) {
+    return OsmAndCoreJNI.ObfDataInterface_loadBasemapPresenceFlag__SWIG_1(swigCPtr, this, SWIGTYPE_p_bool.getCPtr(outBasemapPresent));
+  }
+
+  public boolean loadMapObjects(SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__Model__BinaryMapObject_const_t_t resultOut, SWIGTYPE_p_MapFoundationType outFoundation, ZoomLevel zoom, AreaI bbox31, SWIGTYPE_p_FilterMapObjectsByIdFunction filterById, SWIGTYPE_p_ObfMapSectionReader__DataBlocksCache cache, SWIGTYPE_p_QListT_std__shared_ptrT_ObfMapSectionReader__DataBlock_const_t_t outReferencedCacheEntries, SWIGTYPE_p_OsmAnd__IQueryController controller, SWIGTYPE_p_OsmAnd__ObfMapSectionReader_Metrics__Metric_loadMapObjects metric) {
+    return OsmAndCoreJNI.ObfDataInterface_loadMapObjects__SWIG_0(swigCPtr, this, SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__Model__BinaryMapObject_const_t_t.getCPtr(resultOut), SWIGTYPE_p_MapFoundationType.getCPtr(outFoundation), zoom.swigValue(), AreaI.getCPtr(bbox31), bbox31, SWIGTYPE_p_FilterMapObjectsByIdFunction.getCPtr(filterById), SWIGTYPE_p_ObfMapSectionReader__DataBlocksCache.getCPtr(cache), SWIGTYPE_p_QListT_std__shared_ptrT_ObfMapSectionReader__DataBlock_const_t_t.getCPtr(outReferencedCacheEntries), SWIGTYPE_p_OsmAnd__IQueryController.getCPtr(controller), SWIGTYPE_p_OsmAnd__ObfMapSectionReader_Metrics__Metric_loadMapObjects.getCPtr(metric));
+  }
+
+  public boolean loadMapObjects(SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__Model__BinaryMapObject_const_t_t resultOut, SWIGTYPE_p_MapFoundationType outFoundation, ZoomLevel zoom, AreaI bbox31, SWIGTYPE_p_FilterMapObjectsByIdFunction filterById, SWIGTYPE_p_ObfMapSectionReader__DataBlocksCache cache, SWIGTYPE_p_QListT_std__shared_ptrT_ObfMapSectionReader__DataBlock_const_t_t outReferencedCacheEntries, SWIGTYPE_p_OsmAnd__IQueryController controller) {
+    return OsmAndCoreJNI.ObfDataInterface_loadMapObjects__SWIG_1(swigCPtr, this, SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__Model__BinaryMapObject_const_t_t.getCPtr(resultOut), SWIGTYPE_p_MapFoundationType.getCPtr(outFoundation), zoom.swigValue(), AreaI.getCPtr(bbox31), bbox31, SWIGTYPE_p_FilterMapObjectsByIdFunction.getCPtr(filterById), SWIGTYPE_p_ObfMapSectionReader__DataBlocksCache.getCPtr(cache), SWIGTYPE_p_QListT_std__shared_ptrT_ObfMapSectionReader__DataBlock_const_t_t.getCPtr(outReferencedCacheEntries), SWIGTYPE_p_OsmAnd__IQueryController.getCPtr(controller));
+  }
+
+  public boolean loadMapObjects(SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__Model__BinaryMapObject_const_t_t resultOut, SWIGTYPE_p_MapFoundationType outFoundation, ZoomLevel zoom, AreaI bbox31, SWIGTYPE_p_FilterMapObjectsByIdFunction filterById, SWIGTYPE_p_ObfMapSectionReader__DataBlocksCache cache, SWIGTYPE_p_QListT_std__shared_ptrT_ObfMapSectionReader__DataBlock_const_t_t outReferencedCacheEntries) {
+    return OsmAndCoreJNI.ObfDataInterface_loadMapObjects__SWIG_2(swigCPtr, this, SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__Model__BinaryMapObject_const_t_t.getCPtr(resultOut), SWIGTYPE_p_MapFoundationType.getCPtr(outFoundation), zoom.swigValue(), AreaI.getCPtr(bbox31), bbox31, SWIGTYPE_p_FilterMapObjectsByIdFunction.getCPtr(filterById), SWIGTYPE_p_ObfMapSectionReader__DataBlocksCache.getCPtr(cache), SWIGTYPE_p_QListT_std__shared_ptrT_ObfMapSectionReader__DataBlock_const_t_t.getCPtr(outReferencedCacheEntries));
+  }
+
+  public boolean loadMapObjects(SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__Model__BinaryMapObject_const_t_t resultOut, SWIGTYPE_p_MapFoundationType outFoundation, ZoomLevel zoom, AreaI bbox31, SWIGTYPE_p_FilterMapObjectsByIdFunction filterById, SWIGTYPE_p_ObfMapSectionReader__DataBlocksCache cache) {
+    return OsmAndCoreJNI.ObfDataInterface_loadMapObjects__SWIG_3(swigCPtr, this, SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__Model__BinaryMapObject_const_t_t.getCPtr(resultOut), SWIGTYPE_p_MapFoundationType.getCPtr(outFoundation), zoom.swigValue(), AreaI.getCPtr(bbox31), bbox31, SWIGTYPE_p_FilterMapObjectsByIdFunction.getCPtr(filterById), SWIGTYPE_p_ObfMapSectionReader__DataBlocksCache.getCPtr(cache));
+  }
+
+  public boolean loadMapObjects(SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__Model__BinaryMapObject_const_t_t resultOut, SWIGTYPE_p_MapFoundationType outFoundation, ZoomLevel zoom, AreaI bbox31, SWIGTYPE_p_FilterMapObjectsByIdFunction filterById) {
+    return OsmAndCoreJNI.ObfDataInterface_loadMapObjects__SWIG_4(swigCPtr, this, SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__Model__BinaryMapObject_const_t_t.getCPtr(resultOut), SWIGTYPE_p_MapFoundationType.getCPtr(outFoundation), zoom.swigValue(), AreaI.getCPtr(bbox31), bbox31, SWIGTYPE_p_FilterMapObjectsByIdFunction.getCPtr(filterById));
+  }
+
+  public boolean loadMapObjects(SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__Model__BinaryMapObject_const_t_t resultOut, SWIGTYPE_p_MapFoundationType outFoundation, ZoomLevel zoom, AreaI bbox31) {
+    return OsmAndCoreJNI.ObfDataInterface_loadMapObjects__SWIG_5(swigCPtr, this, SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__Model__BinaryMapObject_const_t_t.getCPtr(resultOut), SWIGTYPE_p_MapFoundationType.getCPtr(outFoundation), zoom.swigValue(), AreaI.getCPtr(bbox31), bbox31);
+  }
+
+  public boolean loadMapObjects(SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__Model__BinaryMapObject_const_t_t resultOut, SWIGTYPE_p_MapFoundationType outFoundation, ZoomLevel zoom) {
+    return OsmAndCoreJNI.ObfDataInterface_loadMapObjects__SWIG_6(swigCPtr, this, SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__Model__BinaryMapObject_const_t_t.getCPtr(resultOut), SWIGTYPE_p_MapFoundationType.getCPtr(outFoundation), zoom.swigValue());
+  }
+
+  public boolean loadRoads(SWIGTYPE_p_RoutingDataLevel dataLevel, AreaI bbox31, SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__Model__Road_const_t_t resultOut, SWIGTYPE_p_FilterRoadsByIdFunction filterById, SWIGTYPE_p_ObfRoutingSectionReader__VisitorFunction visitor, SWIGTYPE_p_ObfRoutingSectionReader__DataBlocksCache cache, SWIGTYPE_p_QListT_std__shared_ptrT_ObfRoutingSectionReader__DataBlock_const_t_t outReferencedCacheEntries, SWIGTYPE_p_OsmAnd__IQueryController controller, SWIGTYPE_p_ObfRoutingSectionReader_Metrics__Metric_loadRoads metric) {
+    return OsmAndCoreJNI.ObfDataInterface_loadRoads__SWIG_0(swigCPtr, this, SWIGTYPE_p_RoutingDataLevel.getCPtr(dataLevel), AreaI.getCPtr(bbox31), bbox31, SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__Model__Road_const_t_t.getCPtr(resultOut), SWIGTYPE_p_FilterRoadsByIdFunction.getCPtr(filterById), SWIGTYPE_p_ObfRoutingSectionReader__VisitorFunction.getCPtr(visitor), SWIGTYPE_p_ObfRoutingSectionReader__DataBlocksCache.getCPtr(cache), SWIGTYPE_p_QListT_std__shared_ptrT_ObfRoutingSectionReader__DataBlock_const_t_t.getCPtr(outReferencedCacheEntries), SWIGTYPE_p_OsmAnd__IQueryController.getCPtr(controller), SWIGTYPE_p_ObfRoutingSectionReader_Metrics__Metric_loadRoads.getCPtr(metric));
+  }
+
+  public boolean loadRoads(SWIGTYPE_p_RoutingDataLevel dataLevel, AreaI bbox31, SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__Model__Road_const_t_t resultOut, SWIGTYPE_p_FilterRoadsByIdFunction filterById, SWIGTYPE_p_ObfRoutingSectionReader__VisitorFunction visitor, SWIGTYPE_p_ObfRoutingSectionReader__DataBlocksCache cache, SWIGTYPE_p_QListT_std__shared_ptrT_ObfRoutingSectionReader__DataBlock_const_t_t outReferencedCacheEntries, SWIGTYPE_p_OsmAnd__IQueryController controller) {
+    return OsmAndCoreJNI.ObfDataInterface_loadRoads__SWIG_1(swigCPtr, this, SWIGTYPE_p_RoutingDataLevel.getCPtr(dataLevel), AreaI.getCPtr(bbox31), bbox31, SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__Model__Road_const_t_t.getCPtr(resultOut), SWIGTYPE_p_FilterRoadsByIdFunction.getCPtr(filterById), SWIGTYPE_p_ObfRoutingSectionReader__VisitorFunction.getCPtr(visitor), SWIGTYPE_p_ObfRoutingSectionReader__DataBlocksCache.getCPtr(cache), SWIGTYPE_p_QListT_std__shared_ptrT_ObfRoutingSectionReader__DataBlock_const_t_t.getCPtr(outReferencedCacheEntries), SWIGTYPE_p_OsmAnd__IQueryController.getCPtr(controller));
+  }
+
+  public boolean loadRoads(SWIGTYPE_p_RoutingDataLevel dataLevel, AreaI bbox31, SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__Model__Road_const_t_t resultOut, SWIGTYPE_p_FilterRoadsByIdFunction filterById, SWIGTYPE_p_ObfRoutingSectionReader__VisitorFunction visitor, SWIGTYPE_p_ObfRoutingSectionReader__DataBlocksCache cache, SWIGTYPE_p_QListT_std__shared_ptrT_ObfRoutingSectionReader__DataBlock_const_t_t outReferencedCacheEntries) {
+    return OsmAndCoreJNI.ObfDataInterface_loadRoads__SWIG_2(swigCPtr, this, SWIGTYPE_p_RoutingDataLevel.getCPtr(dataLevel), AreaI.getCPtr(bbox31), bbox31, SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__Model__Road_const_t_t.getCPtr(resultOut), SWIGTYPE_p_FilterRoadsByIdFunction.getCPtr(filterById), SWIGTYPE_p_ObfRoutingSectionReader__VisitorFunction.getCPtr(visitor), SWIGTYPE_p_ObfRoutingSectionReader__DataBlocksCache.getCPtr(cache), SWIGTYPE_p_QListT_std__shared_ptrT_ObfRoutingSectionReader__DataBlock_const_t_t.getCPtr(outReferencedCacheEntries));
+  }
+
+  public boolean loadRoads(SWIGTYPE_p_RoutingDataLevel dataLevel, AreaI bbox31, SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__Model__Road_const_t_t resultOut, SWIGTYPE_p_FilterRoadsByIdFunction filterById, SWIGTYPE_p_ObfRoutingSectionReader__VisitorFunction visitor, SWIGTYPE_p_ObfRoutingSectionReader__DataBlocksCache cache) {
+    return OsmAndCoreJNI.ObfDataInterface_loadRoads__SWIG_3(swigCPtr, this, SWIGTYPE_p_RoutingDataLevel.getCPtr(dataLevel), AreaI.getCPtr(bbox31), bbox31, SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__Model__Road_const_t_t.getCPtr(resultOut), SWIGTYPE_p_FilterRoadsByIdFunction.getCPtr(filterById), SWIGTYPE_p_ObfRoutingSectionReader__VisitorFunction.getCPtr(visitor), SWIGTYPE_p_ObfRoutingSectionReader__DataBlocksCache.getCPtr(cache));
+  }
+
+  public boolean loadRoads(SWIGTYPE_p_RoutingDataLevel dataLevel, AreaI bbox31, SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__Model__Road_const_t_t resultOut, SWIGTYPE_p_FilterRoadsByIdFunction filterById, SWIGTYPE_p_ObfRoutingSectionReader__VisitorFunction visitor) {
+    return OsmAndCoreJNI.ObfDataInterface_loadRoads__SWIG_4(swigCPtr, this, SWIGTYPE_p_RoutingDataLevel.getCPtr(dataLevel), AreaI.getCPtr(bbox31), bbox31, SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__Model__Road_const_t_t.getCPtr(resultOut), SWIGTYPE_p_FilterRoadsByIdFunction.getCPtr(filterById), SWIGTYPE_p_ObfRoutingSectionReader__VisitorFunction.getCPtr(visitor));
+  }
+
+  public boolean loadRoads(SWIGTYPE_p_RoutingDataLevel dataLevel, AreaI bbox31, SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__Model__Road_const_t_t resultOut, SWIGTYPE_p_FilterRoadsByIdFunction filterById) {
+    return OsmAndCoreJNI.ObfDataInterface_loadRoads__SWIG_5(swigCPtr, this, SWIGTYPE_p_RoutingDataLevel.getCPtr(dataLevel), AreaI.getCPtr(bbox31), bbox31, SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__Model__Road_const_t_t.getCPtr(resultOut), SWIGTYPE_p_FilterRoadsByIdFunction.getCPtr(filterById));
+  }
+
+  public boolean loadRoads(SWIGTYPE_p_RoutingDataLevel dataLevel, AreaI bbox31, SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__Model__Road_const_t_t resultOut) {
+    return OsmAndCoreJNI.ObfDataInterface_loadRoads__SWIG_6(swigCPtr, this, SWIGTYPE_p_RoutingDataLevel.getCPtr(dataLevel), AreaI.getCPtr(bbox31), bbox31, SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__Model__Road_const_t_t.getCPtr(resultOut));
+  }
+
+  public boolean loadRoads(SWIGTYPE_p_RoutingDataLevel dataLevel, AreaI bbox31) {
+    return OsmAndCoreJNI.ObfDataInterface_loadRoads__SWIG_7(swigCPtr, this, SWIGTYPE_p_RoutingDataLevel.getCPtr(dataLevel), AreaI.getCPtr(bbox31), bbox31);
+  }
+
+  public boolean loadRoads(SWIGTYPE_p_RoutingDataLevel dataLevel) {
+    return OsmAndCoreJNI.ObfDataInterface_loadRoads__SWIG_8(swigCPtr, this, SWIGTYPE_p_RoutingDataLevel.getCPtr(dataLevel));
+  }
+
+}

JNI/src/net/osmand/core/jni/ObfFile.java

@@ -0,0 +1,59 @@
+/* ----------------------------------------------------------------------------
+ * 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 ObfFile {
+  private long swigCPtr;
+  private boolean swigCMemOwn;
+
+  protected ObfFile(long cPtr, boolean cMemoryOwn) {
+    swigCMemOwn = cMemoryOwn;
+    swigCPtr = cPtr;
+  }
+
+  protected static long getCPtr(ObfFile obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+
+  protected void finalize() {
+    delete();
+  }
+
+  public synchronized void delete() {
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        OsmAndCoreJNI.delete_ObfFile(swigCPtr);
+      }
+      swigCPtr = 0;
+    }
+  }
+
+  public ObfFile(String filePath) {
+    this(OsmAndCoreJNI.new_ObfFile__SWIG_0(filePath), true);
+  }
+
+  public ObfFile(String filePath, java.math.BigInteger fileSize) {
+    this(OsmAndCoreJNI.new_ObfFile__SWIG_1(filePath, fileSize), true);
+  }
+
+  public String getFilePath() {
+    return OsmAndCoreJNI.ObfFile_filePath_get(swigCPtr, this);
+  }
+
+  public java.math.BigInteger getFileSize() {
+    return OsmAndCoreJNI.ObfFile_fileSize_get(swigCPtr, this);
+  }
+
+  public ObfInfo getObfInfo() {
+    long cPtr = OsmAndCoreJNI.ObfFile_obfInfo_get(swigCPtr, this);
+    return (cPtr == 0) ? null : new ObfInfo(cPtr, true);
+  }
+
+}

JNI/src/net/osmand/core/jni/ObfInfo.java

@@ -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 ObfInfo {
+  private long swigCPtr;
+  private boolean swigCMemOwn;
+
+  protected ObfInfo(long cPtr, boolean cMemoryOwn) {
+    swigCMemOwn = cMemoryOwn;
+    swigCPtr = cPtr;
+  }
+
+  protected static long getCPtr(ObfInfo obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+
+  protected void finalize() {
+    delete();
+  }
+
+  public synchronized void delete() {
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        OsmAndCoreJNI.delete_ObfInfo(swigCPtr);
+      }
+      swigCPtr = 0;
+    }
+  }
+
+  public int getVersion() {
+    return OsmAndCoreJNI.ObfInfo_version_get(swigCPtr, this);
+  }
+
+  public java.math.BigInteger getCreationTimestamp() {
+    return OsmAndCoreJNI.ObfInfo_creationTimestamp_get(swigCPtr, this);
+  }
+
+  public boolean getIsBasemap() {
+    return OsmAndCoreJNI.ObfInfo_isBasemap_get(swigCPtr, this);
+  }
+
+  public SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__ObfMapSectionInfo_t_t getMapSections() {
+    return new SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__ObfMapSectionInfo_t_t(OsmAndCoreJNI.ObfInfo_mapSections_get(swigCPtr, this), false);
+  }
+
+  public SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__ObfAddressSectionInfo_t_t getAddressSections() {
+    return new SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__ObfAddressSectionInfo_t_t(OsmAndCoreJNI.ObfInfo_addressSections_get(swigCPtr, this), false);
+  }
+
+  public SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__ObfRoutingSectionInfo_t_t getRoutingSections() {
+    return new SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__ObfRoutingSectionInfo_t_t(OsmAndCoreJNI.ObfInfo_routingSections_get(swigCPtr, this), false);
+  }
+
+  public SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__ObfPoiSectionInfo_t_t getPoiSections() {
+    return new SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__ObfPoiSectionInfo_t_t(OsmAndCoreJNI.ObfInfo_poiSections_get(swigCPtr, this), false);
+  }
+
+  public SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__ObfTransportSectionInfo_t_t getTransportSections() {
+    return new SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__ObfTransportSectionInfo_t_t(OsmAndCoreJNI.ObfInfo_transportSections_get(swigCPtr, this), false);
+  }
+
+}

JNI/src/net/osmand/core/jni/ObfMapSectionDataBlockId.java

@@ -0,0 +1,66 @@
+/* ----------------------------------------------------------------------------
+ * 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 ObfMapSectionDataBlockId {
+  private long swigCPtr;
+  protected boolean swigCMemOwn;
+
+  protected ObfMapSectionDataBlockId(long cPtr, boolean cMemoryOwn) {
+    swigCMemOwn = cMemoryOwn;
+    swigCPtr = cPtr;
+  }
+
+  protected static long getCPtr(ObfMapSectionDataBlockId obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+
+  protected void finalize() {
+    delete();
+  }
+
+  public synchronized void delete() {
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        OsmAndCoreJNI.delete_ObfMapSectionDataBlockId(swigCPtr);
+      }
+      swigCPtr = 0;
+    }
+  }
+
+  public void setId(java.math.BigInteger value) {
+    OsmAndCoreJNI.ObfMapSectionDataBlockId_id_set(swigCPtr, this, value);
+  }
+
+  public java.math.BigInteger getId() {
+    return OsmAndCoreJNI.ObfMapSectionDataBlockId_id_get(swigCPtr, this);
+  }
+
+  public void setSectionRuntimeGeneratedId(int value) {
+    OsmAndCoreJNI.ObfMapSectionDataBlockId_sectionRuntimeGeneratedId_set(swigCPtr, this, value);
+  }
+
+  public int getSectionRuntimeGeneratedId() {
+    return OsmAndCoreJNI.ObfMapSectionDataBlockId_sectionRuntimeGeneratedId_get(swigCPtr, this);
+  }
+
+  public void setOffset(long value) {
+    OsmAndCoreJNI.ObfMapSectionDataBlockId_offset_set(swigCPtr, this, value);
+  }
+
+  public long getOffset() {
+    return OsmAndCoreJNI.ObfMapSectionDataBlockId_offset_get(swigCPtr, this);
+  }
+
+  public ObfMapSectionDataBlockId() {
+    this(OsmAndCoreJNI.new_ObfMapSectionDataBlockId(), true);
+  }
+
+}

JNI/src/net/osmand/core/jni/ObfRoutingSectionDataBlockId.java

@@ -0,0 +1,66 @@
+/* ----------------------------------------------------------------------------
+ * 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 ObfRoutingSectionDataBlockId {
+  private long swigCPtr;
+  protected boolean swigCMemOwn;
+
+  protected ObfRoutingSectionDataBlockId(long cPtr, boolean cMemoryOwn) {
+    swigCMemOwn = cMemoryOwn;
+    swigCPtr = cPtr;
+  }
+
+  protected static long getCPtr(ObfRoutingSectionDataBlockId obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+
+  protected void finalize() {
+    delete();
+  }
+
+  public synchronized void delete() {
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        OsmAndCoreJNI.delete_ObfRoutingSectionDataBlockId(swigCPtr);
+      }
+      swigCPtr = 0;
+    }
+  }
+
+  public void setId(java.math.BigInteger value) {
+    OsmAndCoreJNI.ObfRoutingSectionDataBlockId_id_set(swigCPtr, this, value);
+  }
+
+  public java.math.BigInteger getId() {
+    return OsmAndCoreJNI.ObfRoutingSectionDataBlockId_id_get(swigCPtr, this);
+  }
+
+  public void setSectionRuntimeGeneratedId(int value) {
+    OsmAndCoreJNI.ObfRoutingSectionDataBlockId_sectionRuntimeGeneratedId_set(swigCPtr, this, value);
+  }
+
+  public int getSectionRuntimeGeneratedId() {
+    return OsmAndCoreJNI.ObfRoutingSectionDataBlockId_sectionRuntimeGeneratedId_get(swigCPtr, this);
+  }
+
+  public void setOffset(long value) {
+    OsmAndCoreJNI.ObfRoutingSectionDataBlockId_offset_set(swigCPtr, this, value);
+  }
+
+  public long getOffset() {
+    return OsmAndCoreJNI.ObfRoutingSectionDataBlockId_offset_get(swigCPtr, this);
+  }
+
+  public ObfRoutingSectionDataBlockId() {
+    this(OsmAndCoreJNI.new_ObfRoutingSectionDataBlockId(), true);
+  }
+
+}

JNI/src/net/osmand/core/jni/ObfsCollection.java

@@ -0,0 +1,81 @@
+/* ----------------------------------------------------------------------------
+ * 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 ObfsCollection extends IObfsCollection {
+  private long swigCPtr;
+  private boolean swigCMemOwnDerived;
+
+  protected ObfsCollection(long cPtr, boolean cMemoryOwn) {
+    super(OsmAndCoreJNI.ObfsCollection_SWIGSmartPtrUpcast(cPtr), true);
+    swigCMemOwnDerived = cMemoryOwn;
+    swigCPtr = cPtr;
+  }
+
+  protected static long getCPtr(ObfsCollection obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+
+  protected void finalize() {
+    delete();
+  }
+
+  public synchronized void delete() {
+    if (swigCPtr != 0) {
+      if (swigCMemOwnDerived) {
+        swigCMemOwnDerived = false;
+        OsmAndCoreJNI.delete_ObfsCollection(swigCPtr);
+      }
+      swigCPtr = 0;
+    }
+    super.delete();
+  }
+
+  public ObfsCollection() {
+    this(OsmAndCoreJNI.new_ObfsCollection(), true);
+  }
+
+  public int addDirectory(SWIGTYPE_p_QDir dir, boolean recursive) {
+    return OsmAndCoreJNI.ObfsCollection_addDirectory__SWIG_0(swigCPtr, this, SWIGTYPE_p_QDir.getCPtr(dir), recursive);
+  }
+
+  public int addDirectory(SWIGTYPE_p_QDir dir) {
+    return OsmAndCoreJNI.ObfsCollection_addDirectory__SWIG_1(swigCPtr, this, SWIGTYPE_p_QDir.getCPtr(dir));
+  }
+
+  public int addDirectory(String dirPath, boolean recursive) {
+    return OsmAndCoreJNI.ObfsCollection_addDirectory__SWIG_2(swigCPtr, this, dirPath, recursive);
+  }
+
+  public int addDirectory(String dirPath) {
+    return OsmAndCoreJNI.ObfsCollection_addDirectory__SWIG_3(swigCPtr, this, dirPath);
+  }
+
+  public int addFile(SWIGTYPE_p_QFileInfo fileInfo) {
+    return OsmAndCoreJNI.ObfsCollection_addFile__SWIG_0(swigCPtr, this, SWIGTYPE_p_QFileInfo.getCPtr(fileInfo));
+  }
+
+  public int addFile(String filePath) {
+    return OsmAndCoreJNI.ObfsCollection_addFile__SWIG_1(swigCPtr, this, filePath);
+  }
+
+  public boolean remove(int entryId) {
+    return OsmAndCoreJNI.ObfsCollection_remove(swigCPtr, this, entryId);
+  }
+
+  public SWIGTYPE_p_QListT_std__shared_ptrT_ObfFile_const_t_t getObfFiles() {
+    return new SWIGTYPE_p_QListT_std__shared_ptrT_ObfFile_const_t_t(OsmAndCoreJNI.ObfsCollection_getObfFiles(swigCPtr, this), true);
+  }
+
+  public ObfDataInterface obtainDataInterface() {
+    long cPtr = OsmAndCoreJNI.ObfsCollection_obtainDataInterface(swigCPtr, this);
+    return (cPtr == 0) ? null : new ObfDataInterface(cPtr, true);
+  }
+
+}

JNI/src/net/osmand/core/jni/OnlineRasterMapTileProvider.java

@@ -0,0 +1,132 @@
+/* ----------------------------------------------------------------------------
+ * 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 OnlineRasterMapTileProvider extends IMapRasterBitmapTileProvider {
+  private long swigCPtr;
+  private boolean swigCMemOwnDerived;
+
+  protected OnlineRasterMapTileProvider(long cPtr, boolean cMemoryOwn) {
+    super(OsmAndCoreJNI.OnlineRasterMapTileProvider_SWIGSmartPtrUpcast(cPtr), true);
+    swigCMemOwnDerived = cMemoryOwn;
+    swigCPtr = cPtr;
+  }
+
+  protected static long getCPtr(OnlineRasterMapTileProvider obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+
+  protected void finalize() {
+    delete();
+  }
+
+  public synchronized void delete() {
+    if (swigCPtr != 0) {
+      if (swigCMemOwnDerived) {
+        swigCMemOwnDerived = false;
+        OsmAndCoreJNI.delete_OnlineRasterMapTileProvider(swigCPtr);
+      }
+      swigCPtr = 0;
+    }
+    super.delete();
+  }
+
+  public OnlineRasterMapTileProvider(String name, String urlPattern, ZoomLevel minZoom, ZoomLevel maxZoom, long maxConcurrentDownloads, long providerTileSize, AlphaChannelData alphaChannelData) {
+    this(OsmAndCoreJNI.new_OnlineRasterMapTileProvider__SWIG_0(name, urlPattern, minZoom.swigValue(), maxZoom.swigValue(), maxConcurrentDownloads, providerTileSize, alphaChannelData.swigValue()), true);
+  }
+
+  public OnlineRasterMapTileProvider(String name, String urlPattern, ZoomLevel minZoom, ZoomLevel maxZoom, long maxConcurrentDownloads, long providerTileSize) {
+    this(OsmAndCoreJNI.new_OnlineRasterMapTileProvider__SWIG_1(name, urlPattern, minZoom.swigValue(), maxZoom.swigValue(), maxConcurrentDownloads, providerTileSize), true);
+  }
+
+  public OnlineRasterMapTileProvider(String name, String urlPattern, ZoomLevel minZoom, ZoomLevel maxZoom, long maxConcurrentDownloads) {
+    this(OsmAndCoreJNI.new_OnlineRasterMapTileProvider__SWIG_2(name, urlPattern, minZoom.swigValue(), maxZoom.swigValue(), maxConcurrentDownloads), true);
+  }
+
+  public OnlineRasterMapTileProvider(String name, String urlPattern, ZoomLevel minZoom, ZoomLevel maxZoom) {
+    this(OsmAndCoreJNI.new_OnlineRasterMapTileProvider__SWIG_3(name, urlPattern, minZoom.swigValue(), maxZoom.swigValue()), true);
+  }
+
+  public OnlineRasterMapTileProvider(String name, String urlPattern, ZoomLevel minZoom) {
+    this(OsmAndCoreJNI.new_OnlineRasterMapTileProvider__SWIG_4(name, urlPattern, minZoom.swigValue()), true);
+  }
+
+  public OnlineRasterMapTileProvider(String name, String urlPattern) {
+    this(OsmAndCoreJNI.new_OnlineRasterMapTileProvider__SWIG_5(name, urlPattern), true);
+  }
+
+  public String getName() {
+    return OsmAndCoreJNI.OnlineRasterMapTileProvider_name_get(swigCPtr, this);
+  }
+
+  public String getPathSuffix() {
+    return OsmAndCoreJNI.OnlineRasterMapTileProvider_pathSuffix_get(swigCPtr, this);
+  }
+
+  public String getUrlPattern() {
+    return OsmAndCoreJNI.OnlineRasterMapTileProvider_urlPattern_get(swigCPtr, this);
+  }
+
+  public long getMaxConcurrentDownloads() {
+    return OsmAndCoreJNI.OnlineRasterMapTileProvider_maxConcurrentDownloads_get(swigCPtr, this);
+  }
+
+  public long getProviderTileSize() {
+    return OsmAndCoreJNI.OnlineRasterMapTileProvider_providerTileSize_get(swigCPtr, this);
+  }
+
+  public AlphaChannelData getAlphaChannelData() {
+    return AlphaChannelData.swigToEnum(OsmAndCoreJNI.OnlineRasterMapTileProvider_alphaChannelData_get(swigCPtr, this));
+  }
+
+  public void setLocalCachePath(SWIGTYPE_p_QDir localCachePath, boolean appendPathSuffix) {
+    OsmAndCoreJNI.OnlineRasterMapTileProvider_setLocalCachePath__SWIG_0(swigCPtr, this, SWIGTYPE_p_QDir.getCPtr(localCachePath), appendPathSuffix);
+  }
+
+  public void setLocalCachePath(SWIGTYPE_p_QDir localCachePath) {
+    OsmAndCoreJNI.OnlineRasterMapTileProvider_setLocalCachePath__SWIG_1(swigCPtr, this, SWIGTYPE_p_QDir.getCPtr(localCachePath));
+  }
+
+  public SWIGTYPE_p_QDir getLocalCachePath() {
+    return new SWIGTYPE_p_QDir(OsmAndCoreJNI.OnlineRasterMapTileProvider_localCachePath_get(swigCPtr, this), false);
+  }
+
+  public void setNetworkAccessPermission(boolean allowed) {
+    OsmAndCoreJNI.OnlineRasterMapTileProvider_setNetworkAccessPermission(swigCPtr, this, allowed);
+  }
+
+  public boolean getNetworkAccessAllowed() {
+    return OsmAndCoreJNI.OnlineRasterMapTileProvider_networkAccessAllowed_get(swigCPtr, this);
+  }
+
+  public float getTileDensityFactor() {
+    return OsmAndCoreJNI.OnlineRasterMapTileProvider_getTileDensityFactor(swigCPtr, this);
+  }
+
+  public long getTileSize() {
+    return OsmAndCoreJNI.OnlineRasterMapTileProvider_getTileSize(swigCPtr, this);
+  }
+
+  public boolean obtainData(TileId tileId, ZoomLevel zoom, MapTiledData outTiledData, SWIGTYPE_p_OsmAnd__IQueryController queryController) {
+    return OsmAndCoreJNI.OnlineRasterMapTileProvider_obtainData__SWIG_0(swigCPtr, this, TileId.getCPtr(tileId), tileId, zoom.swigValue(), MapTiledData.getCPtr(outTiledData), outTiledData, SWIGTYPE_p_OsmAnd__IQueryController.getCPtr(queryController));
+  }
+
+  public boolean obtainData(TileId tileId, ZoomLevel zoom, MapTiledData outTiledData) {
+    return OsmAndCoreJNI.OnlineRasterMapTileProvider_obtainData__SWIG_1(swigCPtr, this, TileId.getCPtr(tileId), tileId, zoom.swigValue(), MapTiledData.getCPtr(outTiledData), outTiledData);
+  }
+
+  public ZoomLevel getMinZoom() {
+    return ZoomLevel.swigToEnum(OsmAndCoreJNI.OnlineRasterMapTileProvider_getMinZoom(swigCPtr, this));
+  }
+
+  public ZoomLevel getMaxZoom() {
+    return ZoomLevel.swigToEnum(OsmAndCoreJNI.OnlineRasterMapTileProvider_getMaxZoom(swigCPtr, this));
+  }
+
+}

JNI/src/net/osmand/core/jni/OnlineTileSources.java

@@ -0,0 +1,86 @@
+/* ----------------------------------------------------------------------------
+ * 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 OnlineTileSources extends IOnlineTileSources {
+  private long swigCPtr;
+  private boolean swigCMemOwnDerived;
+
+  protected OnlineTileSources(long cPtr, boolean cMemoryOwn) {
+    super(OsmAndCoreJNI.OnlineTileSources_SWIGSmartPtrUpcast(cPtr), true);
+    swigCMemOwnDerived = cMemoryOwn;
+    swigCPtr = cPtr;
+  }
+
+  protected static long getCPtr(OnlineTileSources obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+
+  protected void finalize() {
+    delete();
+  }
+
+  public synchronized void delete() {
+    if (swigCPtr != 0) {
+      if (swigCMemOwnDerived) {
+        swigCMemOwnDerived = false;
+        OsmAndCoreJNI.delete_OnlineTileSources(swigCPtr);
+      }
+      swigCPtr = 0;
+    }
+    super.delete();
+  }
+
+  public OnlineTileSources() {
+    this(OsmAndCoreJNI.new_OnlineTileSources(), true);
+  }
+
+  public boolean loadFrom(SWIGTYPE_p_QByteArray content) {
+    return OsmAndCoreJNI.OnlineTileSources_loadFrom__SWIG_0(swigCPtr, this, SWIGTYPE_p_QByteArray.getCPtr(content));
+  }
+
+  public boolean loadFrom(SWIGTYPE_p_QIODevice ioDevice) {
+    return OsmAndCoreJNI.OnlineTileSources_loadFrom__SWIG_1(swigCPtr, this, SWIGTYPE_p_QIODevice.getCPtr(ioDevice));
+  }
+
+  public boolean loadFrom(String fileName) {
+    return OsmAndCoreJNI.OnlineTileSources_loadFrom__SWIG_2(swigCPtr, this, fileName);
+  }
+
+  public boolean saveTo(SWIGTYPE_p_QIODevice ioDevice) {
+    return OsmAndCoreJNI.OnlineTileSources_saveTo__SWIG_0(swigCPtr, this, SWIGTYPE_p_QIODevice.getCPtr(ioDevice));
+  }
+
+  public boolean saveTo(String fileName) {
+    return OsmAndCoreJNI.OnlineTileSources_saveTo__SWIG_1(swigCPtr, this, fileName);
+  }
+
+  public SWIGTYPE_p_QHashT_QString_std__shared_ptrT_OsmAnd__IOnlineTileSources__Source_const_t_t getCollection() {
+    return new SWIGTYPE_p_QHashT_QString_std__shared_ptrT_OsmAnd__IOnlineTileSources__Source_const_t_t(OsmAndCoreJNI.OnlineTileSources_getCollection(swigCPtr, this), true);
+  }
+
+  public IOnlineTileSources.Source getSourceByName(String sourceName) {
+    long cPtr = OsmAndCoreJNI.OnlineTileSources_getSourceByName(swigCPtr, this, sourceName);
+    return (cPtr == 0) ? null : new IOnlineTileSources.Source(cPtr, true);
+  }
+
+  public boolean addSource(IOnlineTileSources.Source source) {
+    return OsmAndCoreJNI.OnlineTileSources_addSource(swigCPtr, this, IOnlineTileSources.Source.getCPtr(source));
+  }
+
+  public boolean removeSource(String sourceName) {
+    return OsmAndCoreJNI.OnlineTileSources_removeSource(swigCPtr, this, sourceName);
+  }
+
+  public static OnlineTileSources getBuiltIn() {
+    long cPtr = OsmAndCoreJNI.OnlineTileSources_getBuiltIn();
+    return (cPtr == 0) ? null : new OnlineTileSources(cPtr, true);
+  }
+
+}

JNI/src/net/osmand/core/jni/OsmAndCore.java

@@ -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 OsmAndCore implements OsmAndCoreConstants {
+  public static boolean InitializeCore(ICoreResourcesProvider coreResourcesProvider) {
+    return OsmAndCoreJNI.InitializeCore(ICoreResourcesProvider.getCPtr(coreResourcesProvider), coreResourcesProvider);
+  }
+
+  public static ICoreResourcesProvider getCoreResourcesProvider() {
+    long cPtr = OsmAndCoreJNI.getCoreResourcesProvider();
+    return (cPtr == 0) ? null : new ICoreResourcesProvider(cPtr, true);
+  }
+
+  public static void ReleaseCore() {
+    OsmAndCoreJNI.ReleaseCore();
+  }
+
+  public static int crossProductSign(PointF a, PointF b, PointF p) {
+    return OsmAndCoreJNI.crossProductSign__SWIG_0(PointF.getCPtr(a), a, PointF.getCPtr(b), b, PointF.getCPtr(p), p);
+  }
+
+  public static int crossProductSign(PointD a, PointD b, PointD p) {
+    return OsmAndCoreJNI.crossProductSign__SWIG_1(PointD.getCPtr(a), a, PointD.getCPtr(b), b, PointD.getCPtr(p), p);
+  }
+
+  public static int crossProductSign(PointI a, PointI b, PointI p) {
+    return OsmAndCoreJNI.crossProductSign__SWIG_2(PointI.getCPtr(a), a, PointI.getCPtr(b), b, PointI.getCPtr(p), p);
+  }
+
+  public static int crossProductSign(SWIGTYPE_p_OsmAnd__PointT_long_long_t a, SWIGTYPE_p_OsmAnd__PointT_long_long_t b, SWIGTYPE_p_OsmAnd__PointT_long_long_t p) {
+    return OsmAndCoreJNI.crossProductSign__SWIG_3(SWIGTYPE_p_OsmAnd__PointT_long_long_t.getCPtr(a), SWIGTYPE_p_OsmAnd__PointT_long_long_t.getCPtr(b), SWIGTYPE_p_OsmAnd__PointT_long_long_t.getCPtr(p));
+  }
+
+  public static boolean testLineLineIntersection(PointI a0, PointI a1, PointI b0, PointI b1) {
+    return OsmAndCoreJNI.testLineLineIntersection__SWIG_0(PointI.getCPtr(a0), a0, PointI.getCPtr(a1), a1, PointI.getCPtr(b0), b0, PointI.getCPtr(b1), b1);
+  }
+
+  public static boolean testLineLineIntersection(PointF a0, PointF a1, PointF b0, PointF b1) {
+    return OsmAndCoreJNI.testLineLineIntersection__SWIG_1(PointF.getCPtr(a0), a0, PointF.getCPtr(a1), a1, PointF.getCPtr(b0), b0, PointF.getCPtr(b1), b1);
+  }
+
+  public static boolean testLineLineIntersection(PointD a0, PointD a1, PointD b0, PointD b1) {
+    return OsmAndCoreJNI.testLineLineIntersection__SWIG_2(PointD.getCPtr(a0), a0, PointD.getCPtr(a1), a1, PointD.getCPtr(b0), b0, PointD.getCPtr(b1), b1);
+  }
+
+  public static boolean testLineLineIntersection(SWIGTYPE_p_OsmAnd__PointT_long_long_t a0, SWIGTYPE_p_OsmAnd__PointT_long_long_t a1, SWIGTYPE_p_OsmAnd__PointT_long_long_t b0, SWIGTYPE_p_OsmAnd__PointT_long_long_t b1) {
+    return OsmAndCoreJNI.testLineLineIntersection__SWIG_3(SWIGTYPE_p_OsmAnd__PointT_long_long_t.getCPtr(a0), SWIGTYPE_p_OsmAnd__PointT_long_long_t.getCPtr(a1), SWIGTYPE_p_OsmAnd__PointT_long_long_t.getCPtr(b0), SWIGTYPE_p_OsmAnd__PointT_long_long_t.getCPtr(b1));
+  }
+
+  public static void LogPrintf(LogSeverityLevel level, String format) {
+    OsmAndCoreJNI.LogPrintf(level.swigValue(), format);
+  }
+
+  public static void LogFlush() {
+    OsmAndCoreJNI.LogFlush();
+  }
+
+  public static IMapRenderer createMapRenderer(MapRendererClass mapRendererClass) {
+    long cPtr = OsmAndCoreJNI.createMapRenderer(mapRendererClass.swigValue());
+    return (cPtr == 0) ? null : new IMapRenderer(cPtr, true);
+  }
+
+}

JNI/src/net/osmand/core/jni/OsmAndCoreConstants.java

@@ -0,0 +1,21 @@
+/* ----------------------------------------------------------------------------
+ * 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 interface OsmAndCoreConstants {
+  public final static int OSMAND_DEBUG = OsmAndCoreJNI.OSMAND_DEBUG_get();
+  public final static int ZoomLevelsCount = OsmAndCoreJNI.ZoomLevelsCount_get();
+
+  public final static int RoutingDataLevelsCount = OsmAndCoreJNI.RoutingDataLevelsCount_get();
+
+  public final static int MapStyleRulesetTypesCount = OsmAndCoreJNI.MapStyleRulesetTypesCount_get();
+
+  public final static int RasterMapLayersCount = OsmAndCoreJNI.RasterMapLayersCount_get();
+
+}

JNI/src/net/osmand/core/jni/PointD.java

@@ -0,0 +1,66 @@
+/* ----------------------------------------------------------------------------
+ * 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 PointD {
+  private long swigCPtr;
+  protected boolean swigCMemOwn;
+
+  protected PointD(long cPtr, boolean cMemoryOwn) {
+    swigCMemOwn = cMemoryOwn;
+    swigCPtr = cPtr;
+  }
+
+  protected static long getCPtr(PointD obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+
+  protected void finalize() {
+    delete();
+  }
+
+  public synchronized void delete() {
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        OsmAndCoreJNI.delete_PointD(swigCPtr);
+      }
+      swigCPtr = 0;
+    }
+  }
+
+  public void setX(double value) {
+    OsmAndCoreJNI.PointD_x_set(swigCPtr, this, value);
+  }
+
+  public double getX() {
+    return OsmAndCoreJNI.PointD_x_get(swigCPtr, this);
+  }
+
+  public void setY(double value) {
+    OsmAndCoreJNI.PointD_y_set(swigCPtr, this, value);
+  }
+
+  public double getY() {
+    return OsmAndCoreJNI.PointD_y_get(swigCPtr, this);
+  }
+
+  public PointD() {
+    this(OsmAndCoreJNI.new_PointD__SWIG_0(), true);
+  }
+
+  public PointD(PointD that) {
+    this(OsmAndCoreJNI.new_PointD__SWIG_1(PointD.getCPtr(that), that), true);
+  }
+
+  public PointD(double x, double y) {
+    this(OsmAndCoreJNI.new_PointD__SWIG_2(x, y), true);
+  }
+
+}

JNI/src/net/osmand/core/jni/PointF.java

@@ -0,0 +1,66 @@
+/* ----------------------------------------------------------------------------
+ * 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 PointF {
+  private long swigCPtr;
+  protected boolean swigCMemOwn;
+
+  protected PointF(long cPtr, boolean cMemoryOwn) {
+    swigCMemOwn = cMemoryOwn;
+    swigCPtr = cPtr;
+  }
+
+  protected static long getCPtr(PointF obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+
+  protected void finalize() {
+    delete();
+  }
+
+  public synchronized void delete() {
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        OsmAndCoreJNI.delete_PointF(swigCPtr);
+      }
+      swigCPtr = 0;
+    }
+  }
+
+  public void setX(float value) {
+    OsmAndCoreJNI.PointF_x_set(swigCPtr, this, value);
+  }
+
+  public float getX() {
+    return OsmAndCoreJNI.PointF_x_get(swigCPtr, this);
+  }
+
+  public void setY(float value) {
+    OsmAndCoreJNI.PointF_y_set(swigCPtr, this, value);
+  }
+
+  public float getY() {
+    return OsmAndCoreJNI.PointF_y_get(swigCPtr, this);
+  }
+
+  public PointF() {
+    this(OsmAndCoreJNI.new_PointF__SWIG_0(), true);
+  }
+
+  public PointF(PointF that) {
+    this(OsmAndCoreJNI.new_PointF__SWIG_1(PointF.getCPtr(that), that), true);
+  }
+
+  public PointF(float x, float y) {
+    this(OsmAndCoreJNI.new_PointF__SWIG_2(x, y), true);
+  }
+
+}

JNI/src/net/osmand/core/jni/PointI.java

@@ -0,0 +1,66 @@
+/* ----------------------------------------------------------------------------
+ * 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 PointI {
+  private long swigCPtr;
+  protected boolean swigCMemOwn;
+
+  protected PointI(long cPtr, boolean cMemoryOwn) {
+    swigCMemOwn = cMemoryOwn;
+    swigCPtr = cPtr;
+  }
+
+  protected static long getCPtr(PointI obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+
+  protected void finalize() {
+    delete();
+  }
+
+  public synchronized void delete() {
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        OsmAndCoreJNI.delete_PointI(swigCPtr);
+      }
+      swigCPtr = 0;
+    }
+  }
+
+  public void setX(int value) {
+    OsmAndCoreJNI.PointI_x_set(swigCPtr, this, value);
+  }
+
+  public int getX() {
+    return OsmAndCoreJNI.PointI_x_get(swigCPtr, this);
+  }
+
+  public void setY(int value) {
+    OsmAndCoreJNI.PointI_y_set(swigCPtr, this, value);
+  }
+
+  public int getY() {
+    return OsmAndCoreJNI.PointI_y_get(swigCPtr, this);
+  }
+
+  public PointI() {
+    this(OsmAndCoreJNI.new_PointI__SWIG_0(), true);
+  }
+
+  public PointI(PointI that) {
+    this(OsmAndCoreJNI.new_PointI__SWIG_1(PointI.getCPtr(that), that), true);
+  }
+
+  public PointI(int x, int y) {
+    this(OsmAndCoreJNI.new_PointI__SWIG_2(x, y), true);
+  }
+
+}

JNI/src/net/osmand/core/jni/Primitiviser.java

@@ -0,0 +1,757 @@
+/* ----------------------------------------------------------------------------
+ * 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 Primitiviser {
+  private long swigCPtr;
+  private boolean swigCMemOwn;
+
+  protected Primitiviser(long cPtr, boolean cMemoryOwn) {
+    swigCMemOwn = cMemoryOwn;
+    swigCPtr = cPtr;
+  }
+
+  protected static long getCPtr(Primitiviser obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+
+  protected void finalize() {
+    delete();
+  }
+
+  public synchronized void delete() {
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        OsmAndCoreJNI.delete_Primitiviser(swigCPtr);
+      }
+      swigCPtr = 0;
+    }
+  }
+
+  static public class PrimitivesGroup {
+    private long swigCPtr;
+    private boolean swigCMemOwn;
+  
+    protected PrimitivesGroup(long cPtr, boolean cMemoryOwn) {
+      swigCMemOwn = cMemoryOwn;
+      swigCPtr = cPtr;
+    }
+  
+    protected static long getCPtr(PrimitivesGroup obj) {
+      return (obj == null) ? 0 : obj.swigCPtr;
+    }
+  
+    protected void finalize() {
+      delete();
+    }
+  
+    public synchronized void delete() {
+      if (swigCPtr != 0) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          OsmAndCoreJNI.delete_Primitiviser_PrimitivesGroup(swigCPtr);
+        }
+        swigCPtr = 0;
+      }
+    }
+  
+    public SWIGTYPE_p_std__shared_ptrT_OsmAnd__Model__BinaryMapObject_const_t getSourceObject() {
+      long cPtr = OsmAndCoreJNI.Primitiviser_PrimitivesGroup_sourceObject_get(swigCPtr, this);
+      return (cPtr == 0) ? null : new SWIGTYPE_p_std__shared_ptrT_OsmAnd__Model__BinaryMapObject_const_t(cPtr, false);
+    }
+  
+    public void setPolygons(SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__Primitiviser__Primitive_const_t_t value) {
+      OsmAndCoreJNI.Primitiviser_PrimitivesGroup_polygons_set(swigCPtr, this, SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__Primitiviser__Primitive_const_t_t.getCPtr(value));
+    }
+  
+    public SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__Primitiviser__Primitive_const_t_t getPolygons() {
+      long cPtr = OsmAndCoreJNI.Primitiviser_PrimitivesGroup_polygons_get(swigCPtr, this);
+      return (cPtr == 0) ? null : new SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__Primitiviser__Primitive_const_t_t(cPtr, false);
+    }
+  
+    public void setPolylines(SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__Primitiviser__Primitive_const_t_t value) {
+      OsmAndCoreJNI.Primitiviser_PrimitivesGroup_polylines_set(swigCPtr, this, SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__Primitiviser__Primitive_const_t_t.getCPtr(value));
+    }
+  
+    public SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__Primitiviser__Primitive_const_t_t getPolylines() {
+      long cPtr = OsmAndCoreJNI.Primitiviser_PrimitivesGroup_polylines_get(swigCPtr, this);
+      return (cPtr == 0) ? null : new SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__Primitiviser__Primitive_const_t_t(cPtr, false);
+    }
+  
+    public void setPoints(SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__Primitiviser__Primitive_const_t_t value) {
+      OsmAndCoreJNI.Primitiviser_PrimitivesGroup_points_set(swigCPtr, this, SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__Primitiviser__Primitive_const_t_t.getCPtr(value));
+    }
+  
+    public SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__Primitiviser__Primitive_const_t_t getPoints() {
+      long cPtr = OsmAndCoreJNI.Primitiviser_PrimitivesGroup_points_get(swigCPtr, this);
+      return (cPtr == 0) ? null : new SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__Primitiviser__Primitive_const_t_t(cPtr, false);
+    }
+  
+  }
+
+  static public class Primitive {
+    private long swigCPtr;
+    private boolean swigCMemOwn;
+  
+    protected Primitive(long cPtr, boolean cMemoryOwn) {
+      swigCMemOwn = cMemoryOwn;
+      swigCPtr = cPtr;
+    }
+  
+    protected static long getCPtr(Primitive obj) {
+      return (obj == null) ? 0 : obj.swigCPtr;
+    }
+  
+    protected void finalize() {
+      delete();
+    }
+  
+    public synchronized void delete() {
+      if (swigCPtr != 0) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          OsmAndCoreJNI.delete_Primitiviser_Primitive(swigCPtr);
+        }
+        swigCPtr = 0;
+      }
+    }
+  
+    public SWIGTYPE_p_std__weak_ptrT_OsmAnd__Primitiviser__PrimitivesGroup_const_t getGroup() {
+      long cPtr = OsmAndCoreJNI.Primitiviser_Primitive_group_get(swigCPtr, this);
+      return (cPtr == 0) ? null : new SWIGTYPE_p_std__weak_ptrT_OsmAnd__Primitiviser__PrimitivesGroup_const_t(cPtr, false);
+    }
+  
+    public SWIGTYPE_p_std__shared_ptrT_OsmAnd__Model__BinaryMapObject_const_t getSourceObject() {
+      long cPtr = OsmAndCoreJNI.Primitiviser_Primitive_sourceObject_get(swigCPtr, this);
+      return (cPtr == 0) ? null : new SWIGTYPE_p_std__shared_ptrT_OsmAnd__Model__BinaryMapObject_const_t(cPtr, false);
+    }
+  
+    public Primitiviser.PrimitiveType getType() {
+      return Primitiviser.PrimitiveType.swigToEnum(OsmAndCoreJNI.Primitiviser_Primitive_type_get(swigCPtr, this));
+    }
+  
+    public long getTypeRuleIdIndex() {
+      return OsmAndCoreJNI.Primitiviser_Primitive_typeRuleIdIndex_get(swigCPtr, this);
+    }
+  
+    public SWIGTYPE_p_MapStyleEvaluationResult getEvaluationResult() {
+      return new SWIGTYPE_p_MapStyleEvaluationResult(OsmAndCoreJNI.Primitiviser_Primitive_evaluationResult_get(swigCPtr, this), true);
+    }
+  
+    public void setZOrder(int value) {
+      OsmAndCoreJNI.Primitiviser_Primitive_zOrder_set(swigCPtr, this, value);
+    }
+  
+    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 {
+    private long swigCPtr;
+    private boolean swigCMemOwn;
+  
+    protected SymbolsGroup(long cPtr, boolean cMemoryOwn) {
+      swigCMemOwn = cMemoryOwn;
+      swigCPtr = cPtr;
+    }
+  
+    protected static long getCPtr(SymbolsGroup obj) {
+      return (obj == null) ? 0 : obj.swigCPtr;
+    }
+  
+    protected void finalize() {
+      delete();
+    }
+  
+    public synchronized void delete() {
+      if (swigCPtr != 0) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          OsmAndCoreJNI.delete_Primitiviser_SymbolsGroup(swigCPtr);
+        }
+        swigCPtr = 0;
+      }
+    }
+  
+    public SWIGTYPE_p_std__shared_ptrT_OsmAnd__Model__BinaryMapObject_const_t getSourceObject() {
+      long cPtr = OsmAndCoreJNI.Primitiviser_SymbolsGroup_sourceObject_get(swigCPtr, this);
+      return (cPtr == 0) ? null : new SWIGTYPE_p_std__shared_ptrT_OsmAnd__Model__BinaryMapObject_const_t(cPtr, false);
+    }
+  
+    public void setSymbols(SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__Primitiviser__Symbol_const_t_t value) {
+      OsmAndCoreJNI.Primitiviser_SymbolsGroup_symbols_set(swigCPtr, this, SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__Primitiviser__Symbol_const_t_t.getCPtr(value));
+    }
+  
+    public SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__Primitiviser__Symbol_const_t_t getSymbols() {
+      long cPtr = OsmAndCoreJNI.Primitiviser_SymbolsGroup_symbols_get(swigCPtr, this);
+      return (cPtr == 0) ? null : new SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__Primitiviser__Symbol_const_t_t(cPtr, false);
+    }
+  
+  }
+
+  static public class Symbol {
+    private long swigCPtr;
+    private boolean swigCMemOwn;
+  
+    protected Symbol(long cPtr, boolean cMemoryOwn) {
+      swigCMemOwn = cMemoryOwn;
+      swigCPtr = cPtr;
+    }
+  
+    protected static long getCPtr(Symbol obj) {
+      return (obj == null) ? 0 : obj.swigCPtr;
+    }
+  
+    protected void finalize() {
+      delete();
+    }
+  
+    public synchronized void delete() {
+      if (swigCPtr != 0) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          OsmAndCoreJNI.delete_Primitiviser_Symbol(swigCPtr);
+        }
+        swigCPtr = 0;
+      }
+    }
+  
+    public Primitiviser.Primitive getPrimitive() {
+      long cPtr = OsmAndCoreJNI.Primitiviser_Symbol_primitive_get(swigCPtr, this);
+      return (cPtr == 0) ? null : new Primitiviser.Primitive(cPtr, true);
+    }
+  
+    public void setLocation31(PointI value) {
+      OsmAndCoreJNI.Primitiviser_Symbol_location31_set(swigCPtr, this, PointI.getCPtr(value), value);
+    }
+  
+    public PointI getLocation31() {
+      long cPtr = OsmAndCoreJNI.Primitiviser_Symbol_location31_get(swigCPtr, this);
+      return (cPtr == 0) ? null : new PointI(cPtr, false);
+    }
+  
+    public void setOrder(int value) {
+      OsmAndCoreJNI.Primitiviser_Symbol_order_set(swigCPtr, this, value);
+    }
+  
+    public int getOrder() {
+      return OsmAndCoreJNI.Primitiviser_Symbol_order_get(swigCPtr, this);
+    }
+  
+    public void setDrawAlongPath(boolean value) {
+      OsmAndCoreJNI.Primitiviser_Symbol_drawAlongPath_set(swigCPtr, this, value);
+    }
+  
+    public boolean getDrawAlongPath() {
+      return OsmAndCoreJNI.Primitiviser_Symbol_drawAlongPath_get(swigCPtr, this);
+    }
+  
+    public void setIntersectsWith(SWIGTYPE_p_QSetT_QString_t value) {
+      OsmAndCoreJNI.Primitiviser_Symbol_intersectsWith_set(swigCPtr, this, SWIGTYPE_p_QSetT_QString_t.getCPtr(value));
+    }
+  
+    public SWIGTYPE_p_QSetT_QString_t getIntersectsWith() {
+      long cPtr = OsmAndCoreJNI.Primitiviser_Symbol_intersectsWith_get(swigCPtr, this);
+      return (cPtr == 0) ? null : new SWIGTYPE_p_QSetT_QString_t(cPtr, false);
+    }
+  
+  }
+
+  static public class TextSymbol extends Primitiviser.Symbol {
+    private long swigCPtr;
+    private boolean swigCMemOwnDerived;
+  
+    protected TextSymbol(long cPtr, boolean cMemoryOwn) {
+      super(OsmAndCoreJNI.Primitiviser_TextSymbol_SWIGSmartPtrUpcast(cPtr), true);
+      swigCMemOwnDerived = cMemoryOwn;
+      swigCPtr = cPtr;
+    }
+  
+    protected static long getCPtr(TextSymbol obj) {
+      return (obj == null) ? 0 : obj.swigCPtr;
+    }
+  
+    protected void finalize() {
+      delete();
+    }
+  
+    public synchronized void delete() {
+      if (swigCPtr != 0) {
+        if (swigCMemOwnDerived) {
+          swigCMemOwnDerived = false;
+          OsmAndCoreJNI.delete_Primitiviser_TextSymbol(swigCPtr);
+        }
+        swigCPtr = 0;
+      }
+      super.delete();
+    }
+  
+    public void setValue(String value) {
+      OsmAndCoreJNI.Primitiviser_TextSymbol_value_set(swigCPtr, this, value);
+    }
+  
+    public String getValue() {
+      return OsmAndCoreJNI.Primitiviser_TextSymbol_value_get(swigCPtr, this);
+    }
+  
+    public void setLanguageId(LanguageId value) {
+      OsmAndCoreJNI.Primitiviser_TextSymbol_languageId_set(swigCPtr, this, value.swigValue());
+    }
+  
+    public LanguageId getLanguageId() {
+      return LanguageId.swigToEnum(OsmAndCoreJNI.Primitiviser_TextSymbol_languageId_get(swigCPtr, this));
+    }
+  
+    public void setDrawOnPath(boolean value) {
+      OsmAndCoreJNI.Primitiviser_TextSymbol_drawOnPath_set(swigCPtr, this, value);
+    }
+  
+    public boolean getDrawOnPath() {
+      return OsmAndCoreJNI.Primitiviser_TextSymbol_drawOnPath_get(swigCPtr, this);
+    }
+  
+    public void setVerticalOffset(int value) {
+      OsmAndCoreJNI.Primitiviser_TextSymbol_verticalOffset_set(swigCPtr, this, value);
+    }
+  
+    public int getVerticalOffset() {
+      return OsmAndCoreJNI.Primitiviser_TextSymbol_verticalOffset_get(swigCPtr, this);
+    }
+  
+    public void setColor(ColorARGB value) {
+      OsmAndCoreJNI.Primitiviser_TextSymbol_color_set(swigCPtr, this, ColorARGB.getCPtr(value), value);
+    }
+  
+    public ColorARGB getColor() {
+      long cPtr = OsmAndCoreJNI.Primitiviser_TextSymbol_color_get(swigCPtr, this);
+      return (cPtr == 0) ? null : new ColorARGB(cPtr, false);
+    }
+  
+    public void setSize(int value) {
+      OsmAndCoreJNI.Primitiviser_TextSymbol_size_set(swigCPtr, this, value);
+    }
+  
+    public int getSize() {
+      return OsmAndCoreJNI.Primitiviser_TextSymbol_size_get(swigCPtr, this);
+    }
+  
+    public void setShadowRadius(int value) {
+      OsmAndCoreJNI.Primitiviser_TextSymbol_shadowRadius_set(swigCPtr, this, value);
+    }
+  
+    public int getShadowRadius() {
+      return OsmAndCoreJNI.Primitiviser_TextSymbol_shadowRadius_get(swigCPtr, this);
+    }
+  
+    public void setShadowColor(ColorARGB value) {
+      OsmAndCoreJNI.Primitiviser_TextSymbol_shadowColor_set(swigCPtr, this, ColorARGB.getCPtr(value), value);
+    }
+  
+    public ColorARGB getShadowColor() {
+      long cPtr = OsmAndCoreJNI.Primitiviser_TextSymbol_shadowColor_get(swigCPtr, this);
+      return (cPtr == 0) ? null : new ColorARGB(cPtr, false);
+    }
+  
+    public void setWrapWidth(int value) {
+      OsmAndCoreJNI.Primitiviser_TextSymbol_wrapWidth_set(swigCPtr, this, value);
+    }
+  
+    public int getWrapWidth() {
+      return OsmAndCoreJNI.Primitiviser_TextSymbol_wrapWidth_get(swigCPtr, this);
+    }
+  
+    public void setIsBold(boolean value) {
+      OsmAndCoreJNI.Primitiviser_TextSymbol_isBold_set(swigCPtr, this, value);
+    }
+  
+    public boolean getIsBold() {
+      return OsmAndCoreJNI.Primitiviser_TextSymbol_isBold_get(swigCPtr, this);
+    }
+  
+    public void setMinDistance(PointI value) {
+      OsmAndCoreJNI.Primitiviser_TextSymbol_minDistance_set(swigCPtr, this, PointI.getCPtr(value), value);
+    }
+  
+    public PointI getMinDistance() {
+      long cPtr = OsmAndCoreJNI.Primitiviser_TextSymbol_minDistance_get(swigCPtr, this);
+      return (cPtr == 0) ? null : new PointI(cPtr, false);
+    }
+  
+    public void setShieldResourceName(String value) {
+      OsmAndCoreJNI.Primitiviser_TextSymbol_shieldResourceName_set(swigCPtr, this, value);
+    }
+  
+    public String getShieldResourceName() {
+      return OsmAndCoreJNI.Primitiviser_TextSymbol_shieldResourceName_get(swigCPtr, this);
+    }
+  
+  }
+
+  static public class IconSymbol extends Primitiviser.Symbol {
+    private long swigCPtr;
+    private boolean swigCMemOwnDerived;
+  
+    protected IconSymbol(long cPtr, boolean cMemoryOwn) {
+      super(OsmAndCoreJNI.Primitiviser_IconSymbol_SWIGSmartPtrUpcast(cPtr), true);
+      swigCMemOwnDerived = cMemoryOwn;
+      swigCPtr = cPtr;
+    }
+  
+    protected static long getCPtr(IconSymbol obj) {
+      return (obj == null) ? 0 : obj.swigCPtr;
+    }
+  
+    protected void finalize() {
+      delete();
+    }
+  
+    public synchronized void delete() {
+      if (swigCPtr != 0) {
+        if (swigCMemOwnDerived) {
+          swigCMemOwnDerived = false;
+          OsmAndCoreJNI.delete_Primitiviser_IconSymbol(swigCPtr);
+        }
+        swigCPtr = 0;
+      }
+      super.delete();
+    }
+  
+    public void setResourceName(String value) {
+      OsmAndCoreJNI.Primitiviser_IconSymbol_resourceName_set(swigCPtr, this, value);
+    }
+  
+    public String getResourceName() {
+      return OsmAndCoreJNI.Primitiviser_IconSymbol_resourceName_get(swigCPtr, this);
+    }
+  
+    public void setShieldResourceName(String value) {
+      OsmAndCoreJNI.Primitiviser_IconSymbol_shieldResourceName_set(swigCPtr, this, value);
+    }
+  
+    public String getShieldResourceName() {
+      return OsmAndCoreJNI.Primitiviser_IconSymbol_shieldResourceName_get(swigCPtr, this);
+    }
+  
+    public void setIntersectionSize(float value) {
+      OsmAndCoreJNI.Primitiviser_IconSymbol_intersectionSize_set(swigCPtr, this, value);
+    }
+  
+    public float getIntersectionSize() {
+      return OsmAndCoreJNI.Primitiviser_IconSymbol_intersectionSize_get(swigCPtr, this);
+    }
+  
+  }
+
+  static public class Cache {
+    private long swigCPtr;
+    private boolean swigCMemOwn;
+  
+    protected Cache(long cPtr, boolean cMemoryOwn) {
+      swigCMemOwn = cMemoryOwn;
+      swigCPtr = cPtr;
+    }
+  
+    protected static long getCPtr(Cache obj) {
+      return (obj == null) ? 0 : obj.swigCPtr;
+    }
+  
+    protected void finalize() {
+      delete();
+    }
+  
+    public synchronized void delete() {
+      if (swigCPtr != 0) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          OsmAndCoreJNI.delete_Primitiviser_Cache(swigCPtr);
+        }
+        swigCPtr = 0;
+      }
+    }
+  
+    public Cache() {
+      this(OsmAndCoreJNI.new_Primitiviser_Cache(), true);
+    }
+  
+    public SWIGTYPE_p_SharedResourcesContainerT_unsigned_long_long_OsmAnd__Primitiviser__PrimitivesGroup_const_t getPrimitivesGroups(ZoomLevel zoom) {
+      return new SWIGTYPE_p_SharedResourcesContainerT_unsigned_long_long_OsmAnd__Primitiviser__PrimitivesGroup_const_t(OsmAndCoreJNI.Primitiviser_Cache_getPrimitivesGroups__SWIG_0(swigCPtr, this, zoom.swigValue()), false);
+    }
+  
+    public SWIGTYPE_p_SharedResourcesContainerT_unsigned_long_long_OsmAnd__Primitiviser__SymbolsGroup_const_t getSymbolsGroups(ZoomLevel zoom) {
+      return new SWIGTYPE_p_SharedResourcesContainerT_unsigned_long_long_OsmAnd__Primitiviser__SymbolsGroup_const_t(OsmAndCoreJNI.Primitiviser_Cache_getSymbolsGroups__SWIG_0(swigCPtr, this, zoom.swigValue()), false);
+    }
+  
+    public SWIGTYPE_p_SharedResourcesContainerT_unsigned_long_long_OsmAnd__Primitiviser__PrimitivesGroup_const_t getPrimitivesGroupsPtr(ZoomLevel zoom) {
+      long cPtr = OsmAndCoreJNI.Primitiviser_Cache_getPrimitivesGroupsPtr__SWIG_0(swigCPtr, this, zoom.swigValue());
+      return (cPtr == 0) ? null : new SWIGTYPE_p_SharedResourcesContainerT_unsigned_long_long_OsmAnd__Primitiviser__PrimitivesGroup_const_t(cPtr, false);
+    }
+  
+    public SWIGTYPE_p_SharedResourcesContainerT_unsigned_long_long_OsmAnd__Primitiviser__SymbolsGroup_const_t getSymbolsGroupsPtr(ZoomLevel zoom) {
+      long cPtr = OsmAndCoreJNI.Primitiviser_Cache_getSymbolsGroupsPtr__SWIG_0(swigCPtr, this, zoom.swigValue());
+      return (cPtr == 0) ? null : new SWIGTYPE_p_SharedResourcesContainerT_unsigned_long_long_OsmAnd__Primitiviser__SymbolsGroup_const_t(cPtr, false);
+    }
+  
+  }
+
+  static public class PrimitivisedArea {
+    private long swigCPtr;
+    private boolean swigCMemOwn;
+  
+    protected PrimitivisedArea(long cPtr, boolean cMemoryOwn) {
+      swigCMemOwn = cMemoryOwn;
+      swigCPtr = cPtr;
+    }
+  
+    protected static long getCPtr(PrimitivisedArea obj) {
+      return (obj == null) ? 0 : obj.swigCPtr;
+    }
+  
+    protected void finalize() {
+      delete();
+    }
+  
+    public synchronized void delete() {
+      if (swigCPtr != 0) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          OsmAndCoreJNI.delete_Primitiviser_PrimitivisedArea(swigCPtr);
+        }
+        swigCPtr = 0;
+      }
+    }
+  
+    public AreaI getArea31() {
+      long cPtr = OsmAndCoreJNI.Primitiviser_PrimitivisedArea_area31_get(swigCPtr, this);
+      return (cPtr == 0) ? null : new AreaI(cPtr, false);
+    }
+  
+    public PointI getSizeInPixels() {
+      long cPtr = OsmAndCoreJNI.Primitiviser_PrimitivisedArea_sizeInPixels_get(swigCPtr, this);
+      return (cPtr == 0) ? null : new PointI(cPtr, false);
+    }
+  
+    public ZoomLevel getZoom() {
+      return ZoomLevel.swigToEnum(OsmAndCoreJNI.Primitiviser_PrimitivisedArea_zoom_get(swigCPtr, this));
+    }
+  
+    public MapPresentationEnvironment getMapPresentationEnvironment() {
+      long cPtr = OsmAndCoreJNI.Primitiviser_PrimitivisedArea_mapPresentationEnvironment_get(swigCPtr, this);
+      return (cPtr == 0) ? null : new MapPresentationEnvironment(cPtr, true);
+    }
+  
+    public void setDefaultBackgroundColor(ColorARGB value) {
+      OsmAndCoreJNI.Primitiviser_PrimitivisedArea_defaultBackgroundColor_set(swigCPtr, this, ColorARGB.getCPtr(value), value);
+    }
+  
+    public ColorARGB getDefaultBackgroundColor() {
+      long cPtr = OsmAndCoreJNI.Primitiviser_PrimitivisedArea_defaultBackgroundColor_get(swigCPtr, this);
+      return (cPtr == 0) ? null : new ColorARGB(cPtr, false);
+    }
+  
+    public void setShadowRenderingMode(int value) {
+      OsmAndCoreJNI.Primitiviser_PrimitivisedArea_shadowRenderingMode_set(swigCPtr, this, value);
+    }
+  
+    public int getShadowRenderingMode() {
+      return OsmAndCoreJNI.Primitiviser_PrimitivisedArea_shadowRenderingMode_get(swigCPtr, this);
+    }
+  
+    public void setShadowRenderingColor(ColorARGB value) {
+      OsmAndCoreJNI.Primitiviser_PrimitivisedArea_shadowRenderingColor_set(swigCPtr, this, ColorARGB.getCPtr(value), value);
+    }
+  
+    public ColorARGB getShadowRenderingColor() {
+      long cPtr = OsmAndCoreJNI.Primitiviser_PrimitivisedArea_shadowRenderingColor_get(swigCPtr, this);
+      return (cPtr == 0) ? null : new ColorARGB(cPtr, false);
+    }
+  
+    public void setPolygonAreaMinimalThreshold(double value) {
+      OsmAndCoreJNI.Primitiviser_PrimitivisedArea_polygonAreaMinimalThreshold_set(swigCPtr, this, value);
+    }
+  
+    public double getPolygonAreaMinimalThreshold() {
+      return OsmAndCoreJNI.Primitiviser_PrimitivisedArea_polygonAreaMinimalThreshold_get(swigCPtr, this);
+    }
+  
+    public void setRoadDensityZoomTile(long value) {
+      OsmAndCoreJNI.Primitiviser_PrimitivisedArea_roadDensityZoomTile_set(swigCPtr, this, value);
+    }
+  
+    public long getRoadDensityZoomTile() {
+      return OsmAndCoreJNI.Primitiviser_PrimitivisedArea_roadDensityZoomTile_get(swigCPtr, this);
+    }
+  
+    public void setRoadsDensityLimitPerTile(long value) {
+      OsmAndCoreJNI.Primitiviser_PrimitivisedArea_roadsDensityLimitPerTile_set(swigCPtr, this, value);
+    }
+  
+    public long getRoadsDensityLimitPerTile() {
+      return OsmAndCoreJNI.Primitiviser_PrimitivisedArea_roadsDensityLimitPerTile_get(swigCPtr, this);
+    }
+  
+    public void setShadowLevelMin(int value) {
+      OsmAndCoreJNI.Primitiviser_PrimitivisedArea_shadowLevelMin_set(swigCPtr, this, value);
+    }
+  
+    public int getShadowLevelMin() {
+      return OsmAndCoreJNI.Primitiviser_PrimitivisedArea_shadowLevelMin_get(swigCPtr, this);
+    }
+  
+    public void setShadowLevelMax(int value) {
+      OsmAndCoreJNI.Primitiviser_PrimitivisedArea_shadowLevelMax_set(swigCPtr, this, value);
+    }
+  
+    public int getShadowLevelMax() {
+      return OsmAndCoreJNI.Primitiviser_PrimitivisedArea_shadowLevelMax_get(swigCPtr, this);
+    }
+  
+    public void setScale31ToPixelDivisor(PointD value) {
+      OsmAndCoreJNI.Primitiviser_PrimitivisedArea_scale31ToPixelDivisor_set(swigCPtr, this, PointD.getCPtr(value), value);
+    }
+  
+    public PointD getScale31ToPixelDivisor() {
+      long cPtr = OsmAndCoreJNI.Primitiviser_PrimitivisedArea_scale31ToPixelDivisor_get(swigCPtr, this);
+      return (cPtr == 0) ? null : new PointD(cPtr, false);
+    }
+  
+    public void setPrimitivesGroups(SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__Primitiviser__PrimitivesGroup_const_t_t value) {
+      OsmAndCoreJNI.Primitiviser_PrimitivisedArea_primitivesGroups_set(swigCPtr, this, SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__Primitiviser__PrimitivesGroup_const_t_t.getCPtr(value));
+    }
+  
+    public SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__Primitiviser__PrimitivesGroup_const_t_t getPrimitivesGroups() {
+      long cPtr = OsmAndCoreJNI.Primitiviser_PrimitivisedArea_primitivesGroups_get(swigCPtr, this);
+      return (cPtr == 0) ? null : new SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__Primitiviser__PrimitivesGroup_const_t_t(cPtr, false);
+    }
+  
+    public void setPolygons(SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__Primitiviser__Primitive_const_t_t value) {
+      OsmAndCoreJNI.Primitiviser_PrimitivisedArea_polygons_set(swigCPtr, this, SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__Primitiviser__Primitive_const_t_t.getCPtr(value));
+    }
+  
+    public SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__Primitiviser__Primitive_const_t_t getPolygons() {
+      long cPtr = OsmAndCoreJNI.Primitiviser_PrimitivisedArea_polygons_get(swigCPtr, this);
+      return (cPtr == 0) ? null : new SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__Primitiviser__Primitive_const_t_t(cPtr, false);
+    }
+  
+    public void setPolylines(SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__Primitiviser__Primitive_const_t_t value) {
+      OsmAndCoreJNI.Primitiviser_PrimitivisedArea_polylines_set(swigCPtr, this, SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__Primitiviser__Primitive_const_t_t.getCPtr(value));
+    }
+  
+    public SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__Primitiviser__Primitive_const_t_t getPolylines() {
+      long cPtr = OsmAndCoreJNI.Primitiviser_PrimitivisedArea_polylines_get(swigCPtr, this);
+      return (cPtr == 0) ? null : new SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__Primitiviser__Primitive_const_t_t(cPtr, false);
+    }
+  
+    public void setPoints(SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__Primitiviser__Primitive_const_t_t value) {
+      OsmAndCoreJNI.Primitiviser_PrimitivisedArea_points_set(swigCPtr, this, SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__Primitiviser__Primitive_const_t_t.getCPtr(value));
+    }
+  
+    public SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__Primitiviser__Primitive_const_t_t getPoints() {
+      long cPtr = OsmAndCoreJNI.Primitiviser_PrimitivisedArea_points_get(swigCPtr, this);
+      return (cPtr == 0) ? null : new SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__Primitiviser__Primitive_const_t_t(cPtr, false);
+    }
+  
+    public void setSymbolsGroups(SWIGTYPE_p_QHashT_std__shared_ptrT_OsmAnd__Model__BinaryMapObject_const_t_std__shared_ptrT_OsmAnd__Primitiviser__SymbolsGroup_const_t_t value) {
+      OsmAndCoreJNI.Primitiviser_PrimitivisedArea_symbolsGroups_set(swigCPtr, this, SWIGTYPE_p_QHashT_std__shared_ptrT_OsmAnd__Model__BinaryMapObject_const_t_std__shared_ptrT_OsmAnd__Primitiviser__SymbolsGroup_const_t_t.getCPtr(value));
+    }
+  
+    public SWIGTYPE_p_QHashT_std__shared_ptrT_OsmAnd__Model__BinaryMapObject_const_t_std__shared_ptrT_OsmAnd__Primitiviser__SymbolsGroup_const_t_t getSymbolsGroups() {
+      long cPtr = OsmAndCoreJNI.Primitiviser_PrimitivisedArea_symbolsGroups_get(swigCPtr, this);
+      return (cPtr == 0) ? null : new SWIGTYPE_p_QHashT_std__shared_ptrT_OsmAnd__Model__BinaryMapObject_const_t_std__shared_ptrT_OsmAnd__Primitiviser__SymbolsGroup_const_t_t(cPtr, false);
+    }
+  
+    public boolean isEmpty() {
+      return OsmAndCoreJNI.Primitiviser_PrimitivisedArea_isEmpty(swigCPtr, this);
+    }
+  
+  }
+
+  public Primitiviser(MapPresentationEnvironment environment) {
+    this(OsmAndCoreJNI.new_Primitiviser(MapPresentationEnvironment.getCPtr(environment), environment), true);
+  }
+
+  public MapPresentationEnvironment getEnvironment() {
+    long cPtr = OsmAndCoreJNI.Primitiviser_environment_get(swigCPtr, this);
+    return (cPtr == 0) ? null : new MapPresentationEnvironment(cPtr, true);
+  }
+
+  public Primitiviser.PrimitivisedArea primitivise(AreaI area31, PointI sizeInPixels, ZoomLevel zoom, MapFoundationType foundation, SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__Model__BinaryMapObject_const_t_t objects, Primitiviser.Cache cache, SWIGTYPE_p_OsmAnd__IQueryController controller, SWIGTYPE_p_Primitiviser_Metrics__Metric_primitivise metric) {
+    long cPtr = OsmAndCoreJNI.Primitiviser_primitivise__SWIG_0(swigCPtr, this, AreaI.getCPtr(area31), area31, PointI.getCPtr(sizeInPixels), sizeInPixels, zoom.swigValue(), foundation.swigValue(), SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__Model__BinaryMapObject_const_t_t.getCPtr(objects), Primitiviser.Cache.getCPtr(cache), SWIGTYPE_p_OsmAnd__IQueryController.getCPtr(controller), SWIGTYPE_p_Primitiviser_Metrics__Metric_primitivise.getCPtr(metric));
+    return (cPtr == 0) ? null : new Primitiviser.PrimitivisedArea(cPtr, true);
+  }
+
+  public Primitiviser.PrimitivisedArea primitivise(AreaI area31, PointI sizeInPixels, ZoomLevel zoom, MapFoundationType foundation, SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__Model__BinaryMapObject_const_t_t objects, Primitiviser.Cache cache, SWIGTYPE_p_OsmAnd__IQueryController controller) {
+    long cPtr = OsmAndCoreJNI.Primitiviser_primitivise__SWIG_1(swigCPtr, this, AreaI.getCPtr(area31), area31, PointI.getCPtr(sizeInPixels), sizeInPixels, zoom.swigValue(), foundation.swigValue(), SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__Model__BinaryMapObject_const_t_t.getCPtr(objects), Primitiviser.Cache.getCPtr(cache), SWIGTYPE_p_OsmAnd__IQueryController.getCPtr(controller));
+    return (cPtr == 0) ? null : new Primitiviser.PrimitivisedArea(cPtr, true);
+  }
+
+  public Primitiviser.PrimitivisedArea primitivise(AreaI area31, PointI sizeInPixels, ZoomLevel zoom, MapFoundationType foundation, SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__Model__BinaryMapObject_const_t_t objects, Primitiviser.Cache cache) {
+    long cPtr = OsmAndCoreJNI.Primitiviser_primitivise__SWIG_2(swigCPtr, this, AreaI.getCPtr(area31), area31, PointI.getCPtr(sizeInPixels), sizeInPixels, zoom.swigValue(), foundation.swigValue(), SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__Model__BinaryMapObject_const_t_t.getCPtr(objects), Primitiviser.Cache.getCPtr(cache));
+    return (cPtr == 0) ? null : new Primitiviser.PrimitivisedArea(cPtr, true);
+  }
+
+  public Primitiviser.PrimitivisedArea primitivise(AreaI area31, PointI sizeInPixels, ZoomLevel zoom, MapFoundationType foundation, SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__Model__BinaryMapObject_const_t_t objects) {
+    long cPtr = OsmAndCoreJNI.Primitiviser_primitivise__SWIG_3(swigCPtr, this, AreaI.getCPtr(area31), area31, PointI.getCPtr(sizeInPixels), sizeInPixels, zoom.swigValue(), foundation.swigValue(), SWIGTYPE_p_QListT_std__shared_ptrT_OsmAnd__Model__BinaryMapObject_const_t_t.getCPtr(objects));
+    return (cPtr == 0) ? null : new Primitiviser.PrimitivisedArea(cPtr, true);
+  }
+
+  public enum PrimitiveType {
+    Point(OsmAndCoreJNI.Primitiviser_PrimitiveType_Point_get()),
+    Polyline(OsmAndCoreJNI.Primitiviser_PrimitiveType_Polyline_get()),
+    Polygon(OsmAndCoreJNI.Primitiviser_PrimitiveType_Polygon_get());
+
+    public final int swigValue() {
+      return swigValue;
+    }
+
+    public static PrimitiveType swigToEnum(int swigValue) {
+      PrimitiveType[] swigValues = PrimitiveType.class.getEnumConstants();
+      if (swigValue < swigValues.length && swigValue >= 0 && swigValues[swigValue].swigValue == swigValue)
+        return swigValues[swigValue];
+      for (PrimitiveType swigEnum : swigValues)
+        if (swigEnum.swigValue == swigValue)
+          return swigEnum;
+      throw new IllegalArgumentException("No enum " + PrimitiveType.class + " with value " + swigValue);
+    }
+
+    @SuppressWarnings("unused")
+    private PrimitiveType() {
+      this.swigValue = SwigNext.next++;
+    }
+
+    @SuppressWarnings("unused")
+    private PrimitiveType(int swigValue) {
+      this.swigValue = swigValue;
+      SwigNext.next = swigValue+1;
+    }
+
+    @SuppressWarnings("unused")
+    private PrimitiveType(PrimitiveType swigEnum) {
+      this.swigValue = swigEnum.swigValue;
+      SwigNext.next = this.swigValue+1;
+    }
+
+    private final int swigValue;
+
+    private static class SwigNext {
+      private static int next = 0;
+    }
+  }
+
+}

JNI/src/net/osmand/core/jni/QIODeviceLogSink.java

@@ -0,0 +1,57 @@
+/* ----------------------------------------------------------------------------
+ * 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 QIODeviceLogSink extends ILogSink {
+  private long swigCPtr;
+  private boolean swigCMemOwnDerived;
+
+  protected QIODeviceLogSink(long cPtr, boolean cMemoryOwn) {
+    super(OsmAndCoreJNI.QIODeviceLogSink_SWIGSmartPtrUpcast(cPtr), true);
+    swigCMemOwnDerived = cMemoryOwn;
+    swigCPtr = cPtr;
+  }
+
+  protected static long getCPtr(QIODeviceLogSink obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+
+  protected void finalize() {
+    delete();
+  }
+
+  public synchronized void delete() {
+    if (swigCPtr != 0) {
+      if (swigCMemOwnDerived) {
+        swigCMemOwnDerived = false;
+        OsmAndCoreJNI.delete_QIODeviceLogSink(swigCPtr);
+      }
+      swigCPtr = 0;
+    }
+    super.delete();
+  }
+
+  public QIODeviceLogSink(SWIGTYPE_p_std__shared_ptrT_QIODevice_t outputDevice, boolean autoClose) {
+    this(OsmAndCoreJNI.new_QIODeviceLogSink__SWIG_0(SWIGTYPE_p_std__shared_ptrT_QIODevice_t.getCPtr(outputDevice), autoClose), true);
+  }
+
+  public QIODeviceLogSink(SWIGTYPE_p_std__shared_ptrT_QIODevice_t outputDevice) {
+    this(OsmAndCoreJNI.new_QIODeviceLogSink__SWIG_1(SWIGTYPE_p_std__shared_ptrT_QIODevice_t.getCPtr(outputDevice)), true);
+  }
+
+  public void flush() {
+    OsmAndCoreJNI.QIODeviceLogSink_flush(swigCPtr, this);
+  }
+
+  public static QIODeviceLogSink createFileLogSink(String fileName) {
+    long cPtr = OsmAndCoreJNI.QIODeviceLogSink_createFileLogSink(fileName);
+    return (cPtr == 0) ? null : new QIODeviceLogSink(cPtr, true);
+  }
+
+}

JNI/src/net/osmand/core/jni/QStringList.java

@@ -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 QStringList {
+  private long swigCPtr;
+  protected boolean swigCMemOwn;
+
+  protected QStringList(long cPtr, boolean cMemoryOwn) {
+    swigCMemOwn = cMemoryOwn;
+    swigCPtr = cPtr;
+  }
+
+  protected static long getCPtr(QStringList obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+
+  protected void finalize() {
+    delete();
+  }
+
+  public synchronized void delete() {
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        OsmAndCoreJNI.delete_QStringList(swigCPtr);
+      }
+      swigCPtr = 0;
+    }
+  }
+
+  public QStringList() {
+    this(OsmAndCoreJNI.new_QStringList(), true);
+  }
+
+  public long size() {
+    return OsmAndCoreJNI.QStringList_size(swigCPtr, this);
+  }
+
+  public void reserve(long n) {
+    OsmAndCoreJNI.QStringList_reserve(swigCPtr, this, n);
+  }
+
+  public boolean isEmpty() {
+    return OsmAndCoreJNI.QStringList_isEmpty(swigCPtr, this);
+  }
+
+  public void clear() {
+    OsmAndCoreJNI.QStringList_clear(swigCPtr, this);
+  }
+
+  public void add(String x) {
+    OsmAndCoreJNI.QStringList_add(swigCPtr, this, x);
+  }
+
+  public String get(int i) {
+    return OsmAndCoreJNI.QStringList_get(swigCPtr, this, i);
+  }
+
+  public void set(int i, String val) {
+    OsmAndCoreJNI.QStringList_set(swigCPtr, this, i, val);
+  }
+
+}

JNI/src/net/osmand/core/jni/Quadrant.java

@@ -0,0 +1,54 @@
+/* ----------------------------------------------------------------------------
+ * 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 Quadrant {
+  NE(OsmAndCoreJNI.Quadrant_NE_get()),
+  SE,
+  SW,
+  NW;
+
+  public final int swigValue() {
+    return swigValue;
+  }
+
+  public static Quadrant swigToEnum(int swigValue) {
+    Quadrant[] swigValues = Quadrant.class.getEnumConstants();
+    if (swigValue < swigValues.length && swigValue >= 0 && swigValues[swigValue].swigValue == swigValue)
+      return swigValues[swigValue];
+    for (Quadrant swigEnum : swigValues)
+      if (swigEnum.swigValue == swigValue)
+        return swigEnum;
+    throw new IllegalArgumentException("No enum " + Quadrant.class + " with value " + swigValue);
+  }
+
+  @SuppressWarnings("unused")
+  private Quadrant() {
+    this.swigValue = SwigNext.next++;
+  }
+
+  @SuppressWarnings("unused")
+  private Quadrant(int swigValue) {
+    this.swigValue = swigValue;
+    SwigNext.next = swigValue+1;
+  }
+
+  @SuppressWarnings("unused")
+  private Quadrant(Quadrant swigEnum) {
+    this.swigValue = swigEnum.swigValue;
+    SwigNext.next = this.swigValue+1;
+  }
+
+  private final int swigValue;
+
+  private static class SwigNext {
+    private static int next = 0;
+  }
+}
+

JNI/src/net/osmand/core/jni/RasterBitmapTile.java

@@ -0,0 +1,73 @@
+/* ----------------------------------------------------------------------------
+ * 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 RasterBitmapTile extends MapTiledData {
+  private long swigCPtr;
+  private boolean swigCMemOwnDerived;
+
+  protected RasterBitmapTile(long cPtr, boolean cMemoryOwn) {
+    super(OsmAndCoreJNI.RasterBitmapTile_SWIGSmartPtrUpcast(cPtr), true);
+    swigCMemOwnDerived = cMemoryOwn;
+    swigCPtr = cPtr;
+  }
+
+  protected static long getCPtr(RasterBitmapTile obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+
+  protected void finalize() {
+    delete();
+  }
+
+  public synchronized void delete() {
+    if (swigCPtr != 0) {
+      if (swigCMemOwnDerived) {
+        swigCMemOwnDerived = false;
+        OsmAndCoreJNI.delete_RasterBitmapTile(swigCPtr);
+      }
+      swigCPtr = 0;
+    }
+    super.delete();
+  }
+
+  public RasterBitmapTile(SWIGTYPE_p_std__shared_ptrT_SkBitmap_const_t bitmap, AlphaChannelData alphaChannelData, float densityFactor, TileId tileId, ZoomLevel zoom) {
+    this(OsmAndCoreJNI.new_RasterBitmapTile(SWIGTYPE_p_std__shared_ptrT_SkBitmap_const_t.getCPtr(bitmap), alphaChannelData.swigValue(), densityFactor, TileId.getCPtr(tileId), tileId, zoom.swigValue()), true);
+  }
+
+  public void setBitmap(SWIGTYPE_p_std__shared_ptrT_SkBitmap_const_t value) {
+    OsmAndCoreJNI.RasterBitmapTile_bitmap_set(swigCPtr, this, SWIGTYPE_p_std__shared_ptrT_SkBitmap_const_t.getCPtr(value));
+  }
+
+  public SWIGTYPE_p_std__shared_ptrT_SkBitmap_const_t getBitmap() {
+    long cPtr = OsmAndCoreJNI.RasterBitmapTile_bitmap_get(swigCPtr, this);
+    return (cPtr == 0) ? null : new SWIGTYPE_p_std__shared_ptrT_SkBitmap_const_t(cPtr, false);
+  }
+
+  public void setAlphaChannelData(AlphaChannelData value) {
+    OsmAndCoreJNI.RasterBitmapTile_alphaChannelData_set(swigCPtr, this, value.swigValue());
+  }
+
+  public AlphaChannelData getAlphaChannelData() {
+    return AlphaChannelData.swigToEnum(OsmAndCoreJNI.RasterBitmapTile_alphaChannelData_get(swigCPtr, this));
+  }
+
+  public void setDensityFactor(float value) {
+    OsmAndCoreJNI.RasterBitmapTile_densityFactor_set(swigCPtr, this, value);
+  }
+
+  public float getDensityFactor() {
+    return OsmAndCoreJNI.RasterBitmapTile_densityFactor_get(swigCPtr, this);
+  }
+
+  public void releaseConsumableContent() {
+    OsmAndCoreJNI.RasterBitmapTile_releaseConsumableContent(swigCPtr, this);
+  }
+
+}

JNI/src/net/osmand/core/jni/RasterMapLayerId.java

@@ -0,0 +1,55 @@
+/* ----------------------------------------------------------------------------
+ * 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 RasterMapLayerId {
+  Invalid(OsmAndCoreJNI.RasterMapLayerId_Invalid_get()),
+  BaseLayer,
+  Overlay0,
+  Overlay1,
+  __LAST;
+
+  public final int swigValue() {
+    return swigValue;
+  }
+
+  public static RasterMapLayerId swigToEnum(int swigValue) {
+    RasterMapLayerId[] swigValues = RasterMapLayerId.class.getEnumConstants();
+    if (swigValue < swigValues.length && swigValue >= 0 && swigValues[swigValue].swigValue == swigValue)
+      return swigValues[swigValue];
+    for (RasterMapLayerId swigEnum : swigValues)
+      if (swigEnum.swigValue == swigValue)
+        return swigEnum;
+    throw new IllegalArgumentException("No enum " + RasterMapLayerId.class + " with value " + swigValue);
+  }
+
+  @SuppressWarnings("unused")
+  private RasterMapLayerId() {
+    this.swigValue = SwigNext.next++;
+  }
+
+  @SuppressWarnings("unused")
+  private RasterMapLayerId(int swigValue) {
+    this.swigValue = swigValue;
+    SwigNext.next = swigValue+1;
+  }
+
+  @SuppressWarnings("unused")
+  private RasterMapLayerId(RasterMapLayerId swigEnum) {
+    this.swigValue = swigEnum.swigValue;
+    SwigNext.next = this.swigValue+1;
+  }
+
+  private final int swigValue;
+
+  private static class SwigNext {
+    private static int next = 0;
+  }
+}
+

JNI/src/net/osmand/core/jni/ResolvedMapStyle.java

@@ -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();
+
+}

JNI/src/net/osmand/core/jni/ResourcesManager.java

@@ -0,0 +1,867 @@
+/* ----------------------------------------------------------------------------
+ * 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 ResourcesManager {
+  private long swigCPtr;
+  protected boolean swigCMemOwn;
+
+  protected ResourcesManager(long cPtr, boolean cMemoryOwn) {
+    swigCMemOwn = cMemoryOwn;
+    swigCPtr = cPtr;
+  }
+
+  protected static long getCPtr(ResourcesManager obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+
+  protected void finalize() {
+    delete();
+  }
+
+  public synchronized void delete() {
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        OsmAndCoreJNI.delete_ResourcesManager(swigCPtr);
+      }
+      swigCPtr = 0;
+    }
+  }
+
+  static public class Resource {
+    private long swigCPtr;
+    private boolean swigCMemOwn;
+  
+    protected Resource(long cPtr, boolean cMemoryOwn) {
+      swigCMemOwn = cMemoryOwn;
+      swigCPtr = cPtr;
+    }
+  
+    protected static long getCPtr(Resource obj) {
+      return (obj == null) ? 0 : obj.swigCPtr;
+    }
+  
+    protected void finalize() {
+      delete();
+    }
+  
+    public synchronized void delete() {
+      if (swigCPtr != 0) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          OsmAndCoreJNI.delete_ResourcesManager_Resource(swigCPtr);
+        }
+        swigCPtr = 0;
+      }
+    }
+  
+      static public class Metadata {
+        private long swigCPtr;
+        private boolean swigCMemOwn;
+      
+        protected Metadata(long cPtr, boolean cMemoryOwn) {
+          swigCMemOwn = cMemoryOwn;
+          swigCPtr = cPtr;
+        }
+      
+        protected static long getCPtr(Metadata obj) {
+          return (obj == null) ? 0 : obj.swigCPtr;
+        }
+      
+        protected void finalize() {
+          delete();
+        }
+      
+        public synchronized void delete() {
+          if (swigCPtr != 0) {
+            if (swigCMemOwn) {
+              swigCMemOwn = false;
+              OsmAndCoreJNI.delete_ResourcesManager_Resource_Metadata(swigCPtr);
+            }
+            swigCPtr = 0;
+          }
+        }
+      
+        public Metadata() {
+          this(OsmAndCoreJNI.new_ResourcesManager_Resource_Metadata(), true);
+        }
+      
+      }
+  
+    public String getId() {
+      return OsmAndCoreJNI.ResourcesManager_Resource_id_get(swigCPtr, this);
+    }
+  
+    public ResourcesManager.ResourceType getType() {
+      return ResourcesManager.ResourceType.swigToEnum(OsmAndCoreJNI.ResourcesManager_Resource_type_get(swigCPtr, this));
+    }
+  
+    public ResourcesManager.ResourceOrigin getOrigin() {
+      return ResourcesManager.ResourceOrigin.swigToEnum(OsmAndCoreJNI.ResourcesManager_Resource_origin_get(swigCPtr, this));
+    }
+  
+    public ResourcesManager.Resource.Metadata getMetadata() {
+      long cPtr = OsmAndCoreJNI.ResourcesManager_Resource_metadata_get(swigCPtr, this);
+      return (cPtr == 0) ? null : new ResourcesManager.Resource.Metadata(cPtr, true);
+    }
+  
+  }
+
+  static public class LocalResource extends ResourcesManager.Resource {
+    private long swigCPtr;
+    private boolean swigCMemOwnDerived;
+  
+    protected LocalResource(long cPtr, boolean cMemoryOwn) {
+      super(OsmAndCoreJNI.ResourcesManager_LocalResource_SWIGSmartPtrUpcast(cPtr), true);
+      swigCMemOwnDerived = cMemoryOwn;
+      swigCPtr = cPtr;
+    }
+  
+    protected static long getCPtr(LocalResource obj) {
+      return (obj == null) ? 0 : obj.swigCPtr;
+    }
+  
+    protected void finalize() {
+      delete();
+    }
+  
+    public synchronized void delete() {
+      if (swigCPtr != 0) {
+        if (swigCMemOwnDerived) {
+          swigCMemOwnDerived = false;
+          OsmAndCoreJNI.delete_ResourcesManager_LocalResource(swigCPtr);
+        }
+        swigCPtr = 0;
+      }
+      super.delete();
+    }
+  
+    public String getLocalPath() {
+      return OsmAndCoreJNI.ResourcesManager_LocalResource_localPath_get(swigCPtr, this);
+    }
+  
+    public java.math.BigInteger getSize() {
+      return OsmAndCoreJNI.ResourcesManager_LocalResource_size_get(swigCPtr, this);
+    }
+  
+  }
+
+  static public class UnmanagedResource extends ResourcesManager.LocalResource {
+    private long swigCPtr;
+    private boolean swigCMemOwnDerived;
+  
+    protected UnmanagedResource(long cPtr, boolean cMemoryOwn) {
+      super(OsmAndCoreJNI.ResourcesManager_UnmanagedResource_SWIGSmartPtrUpcast(cPtr), true);
+      swigCMemOwnDerived = cMemoryOwn;
+      swigCPtr = cPtr;
+    }
+  
+    protected static long getCPtr(UnmanagedResource obj) {
+      return (obj == null) ? 0 : obj.swigCPtr;
+    }
+  
+    protected void finalize() {
+      delete();
+    }
+  
+    public synchronized void delete() {
+      if (swigCPtr != 0) {
+        if (swigCMemOwnDerived) {
+          swigCMemOwnDerived = false;
+          OsmAndCoreJNI.delete_ResourcesManager_UnmanagedResource(swigCPtr);
+        }
+        swigCPtr = 0;
+      }
+      super.delete();
+    }
+  
+    public String getName() {
+      return OsmAndCoreJNI.ResourcesManager_UnmanagedResource_name_get(swigCPtr, this);
+    }
+  
+  }
+
+  static public class InstalledResource extends ResourcesManager.LocalResource {
+    private long swigCPtr;
+    private boolean swigCMemOwnDerived;
+  
+    protected InstalledResource(long cPtr, boolean cMemoryOwn) {
+      super(OsmAndCoreJNI.ResourcesManager_InstalledResource_SWIGSmartPtrUpcast(cPtr), true);
+      swigCMemOwnDerived = cMemoryOwn;
+      swigCPtr = cPtr;
+    }
+  
+    protected static long getCPtr(InstalledResource obj) {
+      return (obj == null) ? 0 : obj.swigCPtr;
+    }
+  
+    protected void finalize() {
+      delete();
+    }
+  
+    public synchronized void delete() {
+      if (swigCPtr != 0) {
+        if (swigCMemOwnDerived) {
+          swigCMemOwnDerived = false;
+          OsmAndCoreJNI.delete_ResourcesManager_InstalledResource(swigCPtr);
+        }
+        swigCPtr = 0;
+      }
+      super.delete();
+    }
+  
+    public java.math.BigInteger getTimestamp() {
+      return OsmAndCoreJNI.ResourcesManager_InstalledResource_timestamp_get(swigCPtr, this);
+    }
+  
+  }
+
+  static public class BuiltinResource extends ResourcesManager.Resource {
+    private long swigCPtr;
+    private boolean swigCMemOwnDerived;
+  
+    protected BuiltinResource(long cPtr, boolean cMemoryOwn) {
+      super(OsmAndCoreJNI.ResourcesManager_BuiltinResource_SWIGSmartPtrUpcast(cPtr), true);
+      swigCMemOwnDerived = cMemoryOwn;
+      swigCPtr = cPtr;
+    }
+  
+    protected static long getCPtr(BuiltinResource obj) {
+      return (obj == null) ? 0 : obj.swigCPtr;
+    }
+  
+    protected void finalize() {
+      delete();
+    }
+  
+    public synchronized void delete() {
+      if (swigCPtr != 0) {
+        if (swigCMemOwnDerived) {
+          swigCMemOwnDerived = false;
+          OsmAndCoreJNI.delete_ResourcesManager_BuiltinResource(swigCPtr);
+        }
+        swigCPtr = 0;
+      }
+      super.delete();
+    }
+  
+  }
+
+  static public class ResourceInRepository extends ResourcesManager.Resource {
+    private long swigCPtr;
+    private boolean swigCMemOwnDerived;
+  
+    protected ResourceInRepository(long cPtr, boolean cMemoryOwn) {
+      super(OsmAndCoreJNI.ResourcesManager_ResourceInRepository_SWIGSmartPtrUpcast(cPtr), true);
+      swigCMemOwnDerived = cMemoryOwn;
+      swigCPtr = cPtr;
+    }
+  
+    protected static long getCPtr(ResourceInRepository obj) {
+      return (obj == null) ? 0 : obj.swigCPtr;
+    }
+  
+    protected void finalize() {
+      delete();
+    }
+  
+    public synchronized void delete() {
+      if (swigCPtr != 0) {
+        if (swigCMemOwnDerived) {
+          swigCMemOwnDerived = false;
+          OsmAndCoreJNI.delete_ResourcesManager_ResourceInRepository(swigCPtr);
+        }
+        swigCPtr = 0;
+      }
+      super.delete();
+    }
+  
+    public SWIGTYPE_p_QUrl getUrl() {
+      return new SWIGTYPE_p_QUrl(OsmAndCoreJNI.ResourcesManager_ResourceInRepository_url_get(swigCPtr, this), true);
+    }
+  
+    public java.math.BigInteger getSize() {
+      return OsmAndCoreJNI.ResourcesManager_ResourceInRepository_size_get(swigCPtr, this);
+    }
+  
+    public java.math.BigInteger getTimestamp() {
+      return OsmAndCoreJNI.ResourcesManager_ResourceInRepository_timestamp_get(swigCPtr, this);
+    }
+  
+    public java.math.BigInteger getPackageSize() {
+      return OsmAndCoreJNI.ResourcesManager_ResourceInRepository_packageSize_get(swigCPtr, this);
+    }
+  
+  }
+
+  static public class ObfMetadata extends ResourcesManager.Resource.Metadata {
+    private long swigCPtr;
+    private boolean swigCMemOwnDerived;
+  
+    protected ObfMetadata(long cPtr, boolean cMemoryOwn) {
+      super(OsmAndCoreJNI.ResourcesManager_ObfMetadata_SWIGSmartPtrUpcast(cPtr), true);
+      swigCMemOwnDerived = cMemoryOwn;
+      swigCPtr = cPtr;
+    }
+  
+    protected static long getCPtr(ObfMetadata obj) {
+      return (obj == null) ? 0 : obj.swigCPtr;
+    }
+  
+    protected void finalize() {
+      delete();
+    }
+  
+    public synchronized void delete() {
+      if (swigCPtr != 0) {
+        if (swigCMemOwnDerived) {
+          swigCMemOwnDerived = false;
+          OsmAndCoreJNI.delete_ResourcesManager_ObfMetadata(swigCPtr);
+        }
+        swigCPtr = 0;
+      }
+      super.delete();
+    }
+  
+    public ObfMetadata(ObfFile obfFile) {
+      this(OsmAndCoreJNI.new_ResourcesManager_ObfMetadata(ObfFile.getCPtr(obfFile), obfFile), true);
+    }
+  
+    public ObfFile getObfFile() {
+      long cPtr = OsmAndCoreJNI.ResourcesManager_ObfMetadata_obfFile_get(swigCPtr, this);
+      return (cPtr == 0) ? null : new ObfFile(cPtr, true);
+    }
+  
+  }
+
+  static public class MapStyleMetadata extends ResourcesManager.Resource.Metadata {
+    private long swigCPtr;
+    private boolean swigCMemOwnDerived;
+  
+    protected MapStyleMetadata(long cPtr, boolean cMemoryOwn) {
+      super(OsmAndCoreJNI.ResourcesManager_MapStyleMetadata_SWIGSmartPtrUpcast(cPtr), true);
+      swigCMemOwnDerived = cMemoryOwn;
+      swigCPtr = cPtr;
+    }
+  
+    protected static long getCPtr(MapStyleMetadata obj) {
+      return (obj == null) ? 0 : obj.swigCPtr;
+    }
+  
+    protected void finalize() {
+      delete();
+    }
+  
+    public synchronized void delete() {
+      if (swigCPtr != 0) {
+        if (swigCMemOwnDerived) {
+          swigCMemOwnDerived = false;
+          OsmAndCoreJNI.delete_ResourcesManager_MapStyleMetadata(swigCPtr);
+        }
+        swigCPtr = 0;
+      }
+      super.delete();
+    }
+  
+    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 SWIGTYPE_p_std__shared_ptrT_OsmAnd__UnresolvedMapStyle_t getMapStyle() {
+      long cPtr = OsmAndCoreJNI.ResourcesManager_MapStyleMetadata_mapStyle_get(swigCPtr, this);
+      return (cPtr == 0) ? null : new SWIGTYPE_p_std__shared_ptrT_OsmAnd__UnresolvedMapStyle_t(cPtr, false);
+    }
+  
+  }
+
+  static public class MapStylesPresetsMetadata extends ResourcesManager.Resource.Metadata {
+    private long swigCPtr;
+    private boolean swigCMemOwnDerived;
+  
+    protected MapStylesPresetsMetadata(long cPtr, boolean cMemoryOwn) {
+      super(OsmAndCoreJNI.ResourcesManager_MapStylesPresetsMetadata_SWIGSmartPtrUpcast(cPtr), true);
+      swigCMemOwnDerived = cMemoryOwn;
+      swigCPtr = cPtr;
+    }
+  
+    protected static long getCPtr(MapStylesPresetsMetadata obj) {
+      return (obj == null) ? 0 : obj.swigCPtr;
+    }
+  
+    protected void finalize() {
+      delete();
+    }
+  
+    public synchronized void delete() {
+      if (swigCPtr != 0) {
+        if (swigCMemOwnDerived) {
+          swigCMemOwnDerived = false;
+          OsmAndCoreJNI.delete_ResourcesManager_MapStylesPresetsMetadata(swigCPtr);
+        }
+        swigCPtr = 0;
+      }
+      super.delete();
+    }
+  
+    public MapStylesPresetsMetadata(MapStylesPresetsCollection presets) {
+      this(OsmAndCoreJNI.new_ResourcesManager_MapStylesPresetsMetadata(MapStylesPresetsCollection.getCPtr(presets), presets), true);
+    }
+  
+    public MapStylesPresetsCollection getPresets() {
+      long cPtr = OsmAndCoreJNI.ResourcesManager_MapStylesPresetsMetadata_presets_get(swigCPtr, this);
+      return (cPtr == 0) ? null : new MapStylesPresetsCollection(cPtr, true);
+    }
+  
+  }
+
+  static public class OnlineTileSourcesMetadata extends ResourcesManager.Resource.Metadata {
+    private long swigCPtr;
+    private boolean swigCMemOwnDerived;
+  
+    protected OnlineTileSourcesMetadata(long cPtr, boolean cMemoryOwn) {
+      super(OsmAndCoreJNI.ResourcesManager_OnlineTileSourcesMetadata_SWIGSmartPtrUpcast(cPtr), true);
+      swigCMemOwnDerived = cMemoryOwn;
+      swigCPtr = cPtr;
+    }
+  
+    protected static long getCPtr(OnlineTileSourcesMetadata obj) {
+      return (obj == null) ? 0 : obj.swigCPtr;
+    }
+  
+    protected void finalize() {
+      delete();
+    }
+  
+    public synchronized void delete() {
+      if (swigCPtr != 0) {
+        if (swigCMemOwnDerived) {
+          swigCMemOwnDerived = false;
+          OsmAndCoreJNI.delete_ResourcesManager_OnlineTileSourcesMetadata(swigCPtr);
+        }
+        swigCPtr = 0;
+      }
+      super.delete();
+    }
+  
+    public OnlineTileSourcesMetadata(OnlineTileSources sources) {
+      this(OsmAndCoreJNI.new_ResourcesManager_OnlineTileSourcesMetadata(OnlineTileSources.getCPtr(sources), sources), true);
+    }
+  
+    public OnlineTileSources getSources() {
+      long cPtr = OsmAndCoreJNI.ResourcesManager_OnlineTileSourcesMetadata_sources_get(swigCPtr, this);
+      return (cPtr == 0) ? null : new OnlineTileSources(cPtr, true);
+    }
+  
+  }
+
+  public ResourcesManager(String localStoragePath, String userStoragePath, QStringList readonlyExternalStoragePaths, String miniBasemapFilename, String localTemporaryPath, String repositoryBaseUrl) {
+    this(OsmAndCoreJNI.new_ResourcesManager__SWIG_0(localStoragePath, userStoragePath, QStringList.getCPtr(readonlyExternalStoragePaths), readonlyExternalStoragePaths, miniBasemapFilename, localTemporaryPath, repositoryBaseUrl), true);
+  }
+
+  public ResourcesManager(String localStoragePath, String userStoragePath, QStringList readonlyExternalStoragePaths, String miniBasemapFilename, String localTemporaryPath) {
+    this(OsmAndCoreJNI.new_ResourcesManager__SWIG_1(localStoragePath, userStoragePath, QStringList.getCPtr(readonlyExternalStoragePaths), readonlyExternalStoragePaths, miniBasemapFilename, localTemporaryPath), true);
+  }
+
+  public ResourcesManager(String localStoragePath, String userStoragePath, QStringList readonlyExternalStoragePaths, String miniBasemapFilename) {
+    this(OsmAndCoreJNI.new_ResourcesManager__SWIG_2(localStoragePath, userStoragePath, QStringList.getCPtr(readonlyExternalStoragePaths), readonlyExternalStoragePaths, miniBasemapFilename), true);
+  }
+
+  public ResourcesManager(String localStoragePath, String userStoragePath, QStringList readonlyExternalStoragePaths) {
+    this(OsmAndCoreJNI.new_ResourcesManager__SWIG_3(localStoragePath, userStoragePath, QStringList.getCPtr(readonlyExternalStoragePaths), readonlyExternalStoragePaths), true);
+  }
+
+  public ResourcesManager(String localStoragePath, String userStoragePath) {
+    this(OsmAndCoreJNI.new_ResourcesManager__SWIG_4(localStoragePath, userStoragePath), true);
+  }
+
+  public ResourcesManager(String localStoragePath) {
+    this(OsmAndCoreJNI.new_ResourcesManager__SWIG_5(localStoragePath), true);
+  }
+
+  public String getLocalStoragePath() {
+    return OsmAndCoreJNI.ResourcesManager_localStoragePath_get(swigCPtr, this);
+  }
+
+  public String getUserStoragePath() {
+    return OsmAndCoreJNI.ResourcesManager_userStoragePath_get(swigCPtr, this);
+  }
+
+  public QStringList getReadonlyExternalStoragePaths() {
+    long cPtr = OsmAndCoreJNI.ResourcesManager_readonlyExternalStoragePaths_get(swigCPtr, this);
+    return (cPtr == 0) ? null : new QStringList(cPtr, false);
+  }
+
+  public String getMiniBasemapFilename() {
+    return OsmAndCoreJNI.ResourcesManager_miniBasemapFilename_get(swigCPtr, this);
+  }
+
+  public String getLocalTemporaryPath() {
+    return OsmAndCoreJNI.ResourcesManager_localTemporaryPath_get(swigCPtr, this);
+  }
+
+  public String getRepositoryBaseUrl() {
+    return OsmAndCoreJNI.ResourcesManager_repositoryBaseUrl_get(swigCPtr, this);
+  }
+
+  public ResourcesManager.Resource getResource(String id) {
+    long cPtr = OsmAndCoreJNI.ResourcesManager_getResource(swigCPtr, this, id);
+    return (cPtr == 0) ? null : new ResourcesManager.Resource(cPtr, true);
+  }
+
+  public SWIGTYPE_p_QHashT_QString_std__shared_ptrT_OsmAnd__ResourcesManager__BuiltinResource_const_t_t getBuiltInResources() {
+    return new SWIGTYPE_p_QHashT_QString_std__shared_ptrT_OsmAnd__ResourcesManager__BuiltinResource_const_t_t(OsmAndCoreJNI.ResourcesManager_getBuiltInResources(swigCPtr, this), true);
+  }
+
+  public ResourcesManager.BuiltinResource getBuiltInResource(String id) {
+    long cPtr = OsmAndCoreJNI.ResourcesManager_getBuiltInResource(swigCPtr, this, id);
+    return (cPtr == 0) ? null : new ResourcesManager.BuiltinResource(cPtr, true);
+  }
+
+  public boolean isBuiltInResource(String id) {
+    return OsmAndCoreJNI.ResourcesManager_isBuiltInResource(swigCPtr, this, id);
+  }
+
+  public boolean rescanUnmanagedStoragePaths() {
+    return OsmAndCoreJNI.ResourcesManager_rescanUnmanagedStoragePaths(swigCPtr, this);
+  }
+
+  public SWIGTYPE_p_QHashT_QString_std__shared_ptrT_OsmAnd__ResourcesManager__LocalResource_const_t_t getLocalResources() {
+    return new SWIGTYPE_p_QHashT_QString_std__shared_ptrT_OsmAnd__ResourcesManager__LocalResource_const_t_t(OsmAndCoreJNI.ResourcesManager_getLocalResources(swigCPtr, this), true);
+  }
+
+  public ResourcesManager.LocalResource getLocalResource(String id) {
+    long cPtr = OsmAndCoreJNI.ResourcesManager_getLocalResource(swigCPtr, this, id);
+    return (cPtr == 0) ? null : new ResourcesManager.LocalResource(cPtr, true);
+  }
+
+  public boolean isLocalResource(String id) {
+    return OsmAndCoreJNI.ResourcesManager_isLocalResource(swigCPtr, this, id);
+  }
+
+  public boolean isRepositoryAvailable() {
+    return OsmAndCoreJNI.ResourcesManager_isRepositoryAvailable(swigCPtr, this);
+  }
+
+  public boolean updateRepository() {
+    return OsmAndCoreJNI.ResourcesManager_updateRepository(swigCPtr, this);
+  }
+
+  public SWIGTYPE_p_QHashT_QString_std__shared_ptrT_OsmAnd__ResourcesManager__ResourceInRepository_const_t_t getResourcesInRepository() {
+    return new SWIGTYPE_p_QHashT_QString_std__shared_ptrT_OsmAnd__ResourcesManager__ResourceInRepository_const_t_t(OsmAndCoreJNI.ResourcesManager_getResourcesInRepository(swigCPtr, this), true);
+  }
+
+  public ResourcesManager.ResourceInRepository getResourceInRepository(String id) {
+    long cPtr = OsmAndCoreJNI.ResourcesManager_getResourceInRepository(swigCPtr, this, id);
+    return (cPtr == 0) ? null : new ResourcesManager.ResourceInRepository(cPtr, true);
+  }
+
+  public boolean isResourceInRepository(String id) {
+    return OsmAndCoreJNI.ResourcesManager_isResourceInRepository(swigCPtr, this, id);
+  }
+
+  public boolean isResourceInstalled(String id) {
+    return OsmAndCoreJNI.ResourcesManager_isResourceInstalled(swigCPtr, this, id);
+  }
+
+  public boolean uninstallResource(String id) {
+    return OsmAndCoreJNI.ResourcesManager_uninstallResource(swigCPtr, this, id);
+  }
+
+  public boolean installFromFile(String filePath, ResourcesManager.ResourceType resourceType) {
+    return OsmAndCoreJNI.ResourcesManager_installFromFile__SWIG_0(swigCPtr, this, filePath, resourceType.swigValue());
+  }
+
+  public boolean installFromFile(String id, String filePath, ResourcesManager.ResourceType resourceType) {
+    return OsmAndCoreJNI.ResourcesManager_installFromFile__SWIG_1(swigCPtr, this, id, filePath, resourceType.swigValue());
+  }
+
+  public boolean installFromRepository(String id, SWIGTYPE_p_WebClient__RequestProgressCallbackSignature downloadProgressCallback) {
+    return OsmAndCoreJNI.ResourcesManager_installFromRepository__SWIG_0(swigCPtr, this, id, SWIGTYPE_p_WebClient__RequestProgressCallbackSignature.getCPtr(downloadProgressCallback));
+  }
+
+  public boolean installFromRepository(String id) {
+    return OsmAndCoreJNI.ResourcesManager_installFromRepository__SWIG_1(swigCPtr, this, id);
+  }
+
+  public boolean installFromRepository(String id, String filePath) {
+    return OsmAndCoreJNI.ResourcesManager_installFromRepository__SWIG_2(swigCPtr, this, id, filePath);
+  }
+
+  public boolean isInstalledResourceOutdated(String id) {
+    return OsmAndCoreJNI.ResourcesManager_isInstalledResourceOutdated(swigCPtr, this, id);
+  }
+
+  public SWIGTYPE_p_QHashT_QString_std__shared_ptrT_OsmAnd__ResourcesManager__LocalResource_const_t_t getOutdatedInstalledResources() {
+    return new SWIGTYPE_p_QHashT_QString_std__shared_ptrT_OsmAnd__ResourcesManager__LocalResource_const_t_t(OsmAndCoreJNI.ResourcesManager_getOutdatedInstalledResources(swigCPtr, this), true);
+  }
+
+  public boolean updateFromFile(String filePath) {
+    return OsmAndCoreJNI.ResourcesManager_updateFromFile__SWIG_0(swigCPtr, this, filePath);
+  }
+
+  public boolean updateFromFile(String id, String filePath) {
+    return OsmAndCoreJNI.ResourcesManager_updateFromFile__SWIG_1(swigCPtr, this, id, filePath);
+  }
+
+  public boolean updateFromRepository(String id, SWIGTYPE_p_WebClient__RequestProgressCallbackSignature downloadProgressCallback) {
+    return OsmAndCoreJNI.ResourcesManager_updateFromRepository__SWIG_0(swigCPtr, this, id, SWIGTYPE_p_WebClient__RequestProgressCallbackSignature.getCPtr(downloadProgressCallback));
+  }
+
+  public boolean updateFromRepository(String id) {
+    return OsmAndCoreJNI.ResourcesManager_updateFromRepository__SWIG_1(swigCPtr, this, id);
+  }
+
+  public boolean updateFromRepository(String id, String filePath) {
+    return OsmAndCoreJNI.ResourcesManager_updateFromRepository__SWIG_2(swigCPtr, this, id, filePath);
+  }
+
+  static public class ILocalResourcesChanged {
+    private long swigCPtr;
+    protected boolean swigCMemOwn;
+  
+    protected ILocalResourcesChanged(long cPtr, boolean cMemoryOwn) {
+      swigCMemOwn = cMemoryOwn;
+      swigCPtr = cPtr;
+    }
+  
+    protected static long getCPtr(ILocalResourcesChanged obj) {
+      return (obj == null) ? 0 : obj.swigCPtr;
+    }
+  
+    protected void finalize() {
+      delete();
+    }
+  
+    public synchronized void delete() {
+      if (swigCPtr != 0) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          OsmAndCoreJNI.delete_ResourcesManager_ILocalResourcesChanged(swigCPtr);
+        }
+        swigCPtr = 0;
+      }
+    }
+  
+    protected void swigDirectorDisconnect() {
+      swigCMemOwn = false;
+      delete();
+    }
+  
+    public void swigReleaseOwnership() {
+      swigCMemOwn = false;
+      OsmAndCoreJNI.ResourcesManager_ILocalResourcesChanged_change_ownership(this, swigCPtr, false);
+    }
+  
+    public void swigTakeOwnership() {
+      swigCMemOwn = true;
+      OsmAndCoreJNI.ResourcesManager_ILocalResourcesChanged_change_ownership(this, swigCPtr, true);
+    }
+  
+    public ILocalResourcesChanged() {
+      this(OsmAndCoreJNI.new_ResourcesManager_ILocalResourcesChanged(), true);
+      OsmAndCoreJNI.ResourcesManager_ILocalResourcesChanged_director_connect(this, swigCPtr, swigCMemOwn, true);
+    }
+  
+    public void method(ResourcesManager resourcesManager, QStringList added, QStringList removed, QStringList updated) {
+      OsmAndCoreJNI.ResourcesManager_ILocalResourcesChanged_method(swigCPtr, this, ResourcesManager.getCPtr(resourcesManager), resourcesManager, QStringList.getCPtr(added), added, QStringList.getCPtr(removed), removed, QStringList.getCPtr(updated), updated);
+    }
+  
+    public boolean attachTo(SWIGTYPE_p_OsmAnd__ObservableAsT_OsmAnd__ResourcesManager__ILocalResourcesChanged_t observable, SWIGTYPE_p_OsmAnd__ObservableAsT_OsmAnd__ResourcesManager__ILocalResourcesChanged_t__Tag tag) {
+      return OsmAndCoreJNI.ResourcesManager_ILocalResourcesChanged_attachTo(swigCPtr, this, SWIGTYPE_p_OsmAnd__ObservableAsT_OsmAnd__ResourcesManager__ILocalResourcesChanged_t.getCPtr(observable), SWIGTYPE_p_OsmAnd__ObservableAsT_OsmAnd__ResourcesManager__ILocalResourcesChanged_t__Tag.getCPtr(tag));
+    }
+  
+    public SWIGTYPE_p_OsmAnd__ResourcesManager__LocalResourcesChanged getBinding() {
+      return new SWIGTYPE_p_OsmAnd__ResourcesManager__LocalResourcesChanged(OsmAndCoreJNI.ResourcesManager_ILocalResourcesChanged_getBinding(swigCPtr, this), true);
+    }
+  
+  }
+
+  public SWIGTYPE_p_OsmAnd__ObservableAsT_OsmAnd__ResourcesManager__LocalResourcesChanged_t getLocalResourcesChangeObservable() {
+    long cPtr = OsmAndCoreJNI.ResourcesManager_localResourcesChangeObservable_get(swigCPtr, this);
+    return (cPtr == 0) ? null : new SWIGTYPE_p_OsmAnd__ObservableAsT_OsmAnd__ResourcesManager__LocalResourcesChanged_t(cPtr, false);
+  }
+
+  static public class IRepositoryUpdated {
+    private long swigCPtr;
+    protected boolean swigCMemOwn;
+  
+    protected IRepositoryUpdated(long cPtr, boolean cMemoryOwn) {
+      swigCMemOwn = cMemoryOwn;
+      swigCPtr = cPtr;
+    }
+  
+    protected static long getCPtr(IRepositoryUpdated obj) {
+      return (obj == null) ? 0 : obj.swigCPtr;
+    }
+  
+    protected void finalize() {
+      delete();
+    }
+  
+    public synchronized void delete() {
+      if (swigCPtr != 0) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          OsmAndCoreJNI.delete_ResourcesManager_IRepositoryUpdated(swigCPtr);
+        }
+        swigCPtr = 0;
+      }
+    }
+  
+    protected void swigDirectorDisconnect() {
+      swigCMemOwn = false;
+      delete();
+    }
+  
+    public void swigReleaseOwnership() {
+      swigCMemOwn = false;
+      OsmAndCoreJNI.ResourcesManager_IRepositoryUpdated_change_ownership(this, swigCPtr, false);
+    }
+  
+    public void swigTakeOwnership() {
+      swigCMemOwn = true;
+      OsmAndCoreJNI.ResourcesManager_IRepositoryUpdated_change_ownership(this, swigCPtr, true);
+    }
+  
+    public IRepositoryUpdated() {
+      this(OsmAndCoreJNI.new_ResourcesManager_IRepositoryUpdated(), true);
+      OsmAndCoreJNI.ResourcesManager_IRepositoryUpdated_director_connect(this, swigCPtr, swigCMemOwn, true);
+    }
+  
+    public void method(ResourcesManager resourcesManager) {
+      OsmAndCoreJNI.ResourcesManager_IRepositoryUpdated_method(swigCPtr, this, ResourcesManager.getCPtr(resourcesManager), resourcesManager);
+    }
+  
+    public boolean attachTo(SWIGTYPE_p_OsmAnd__ObservableAsT_OsmAnd__ResourcesManager__IRepositoryUpdated_t observable, SWIGTYPE_p_OsmAnd__ObservableAsT_OsmAnd__ResourcesManager__IRepositoryUpdated_t__Tag tag) {
+      return OsmAndCoreJNI.ResourcesManager_IRepositoryUpdated_attachTo(swigCPtr, this, SWIGTYPE_p_OsmAnd__ObservableAsT_OsmAnd__ResourcesManager__IRepositoryUpdated_t.getCPtr(observable), SWIGTYPE_p_OsmAnd__ObservableAsT_OsmAnd__ResourcesManager__IRepositoryUpdated_t__Tag.getCPtr(tag));
+    }
+  
+    public SWIGTYPE_p_OsmAnd__ResourcesManager__RepositoryUpdated getBinding() {
+      return new SWIGTYPE_p_OsmAnd__ResourcesManager__RepositoryUpdated(OsmAndCoreJNI.ResourcesManager_IRepositoryUpdated_getBinding(swigCPtr, this), true);
+    }
+  
+  }
+
+  public SWIGTYPE_p_OsmAnd__ObservableAsT_OsmAnd__ResourcesManager__RepositoryUpdated_t getRepositoryUpdateObservable() {
+    long cPtr = OsmAndCoreJNI.ResourcesManager_repositoryUpdateObservable_get(swigCPtr, this);
+    return (cPtr == 0) ? null : new SWIGTYPE_p_OsmAnd__ObservableAsT_OsmAnd__ResourcesManager__RepositoryUpdated_t(cPtr, false);
+  }
+
+  public IOnlineTileSources getOnlineTileSources() {
+    long cPtr = OsmAndCoreJNI.ResourcesManager_onlineTileSources_get(swigCPtr, this);
+    return (cPtr == 0) ? null : new IOnlineTileSources(cPtr, true);
+  }
+
+  public IMapStylesCollection getMapStylesCollection() {
+    long cPtr = OsmAndCoreJNI.ResourcesManager_mapStylesCollection_get(swigCPtr, this);
+    return (cPtr == 0) ? null : new IMapStylesCollection(cPtr, true);
+  }
+
+  public IMapStylesPresetsCollection getMapStylesPresetsCollection() {
+    long cPtr = OsmAndCoreJNI.ResourcesManager_mapStylesPresetsCollection_get(swigCPtr, this);
+    return (cPtr == 0) ? null : new IMapStylesPresetsCollection(cPtr, true);
+  }
+
+  public IObfsCollection getObfsCollection() {
+    long cPtr = OsmAndCoreJNI.ResourcesManager_obfsCollection_get(swigCPtr, this);
+    return (cPtr == 0) ? null : new IObfsCollection(cPtr, true);
+  }
+
+  public enum ResourceType {
+    Unknown(OsmAndCoreJNI.ResourcesManager_ResourceType_Unknown_get()),
+    MapRegion,
+    VoicePack,
+    MapStyle,
+    MapStylesPresets,
+    OnlineTileSources;
+
+    public final int swigValue() {
+      return swigValue;
+    }
+
+    public static ResourceType swigToEnum(int swigValue) {
+      ResourceType[] swigValues = ResourceType.class.getEnumConstants();
+      if (swigValue < swigValues.length && swigValue >= 0 && swigValues[swigValue].swigValue == swigValue)
+        return swigValues[swigValue];
+      for (ResourceType swigEnum : swigValues)
+        if (swigEnum.swigValue == swigValue)
+          return swigEnum;
+      throw new IllegalArgumentException("No enum " + ResourceType.class + " with value " + swigValue);
+    }
+
+    @SuppressWarnings("unused")
+    private ResourceType() {
+      this.swigValue = SwigNext.next++;
+    }
+
+    @SuppressWarnings("unused")
+    private ResourceType(int swigValue) {
+      this.swigValue = swigValue;
+      SwigNext.next = swigValue+1;
+    }
+
+    @SuppressWarnings("unused")
+    private ResourceType(ResourceType swigEnum) {
+      this.swigValue = swigEnum.swigValue;
+      SwigNext.next = this.swigValue+1;
+    }
+
+    private final int swigValue;
+
+    private static class SwigNext {
+      private static int next = 0;
+    }
+  }
+
+  public enum ResourceOrigin {
+    Builtin,
+    Installed,
+    Repository,
+    Unmanaged;
+
+    public final int swigValue() {
+      return swigValue;
+    }
+
+    public static ResourceOrigin swigToEnum(int swigValue) {
+      ResourceOrigin[] swigValues = ResourceOrigin.class.getEnumConstants();
+      if (swigValue < swigValues.length && swigValue >= 0 && swigValues[swigValue].swigValue == swigValue)
+        return swigValues[swigValue];
+      for (ResourceOrigin swigEnum : swigValues)
+        if (swigEnum.swigValue == swigValue)
+          return swigEnum;
+      throw new IllegalArgumentException("No enum " + ResourceOrigin.class + " with value " + swigValue);
+    }
+
+    @SuppressWarnings("unused")
+    private ResourceOrigin() {
+      this.swigValue = SwigNext.next++;
+    }
+
+    @SuppressWarnings("unused")
+    private ResourceOrigin(int swigValue) {
+      this.swigValue = swigValue;
+      SwigNext.next = swigValue+1;
+    }
+
+    @SuppressWarnings("unused")
+    private ResourceOrigin(ResourceOrigin swigEnum) {
+      this.swigValue = swigEnum.swigValue;
+      SwigNext.next = this.swigValue+1;
+    }
+
+    private final int swigValue;
+
+    private static class SwigNext {
+      private static int next = 0;
+    }
+  }
+
+}

JNI/src/net/osmand/core/jni/RoutingDataLevel.java

@@ -0,0 +1,52 @@
+/* ----------------------------------------------------------------------------
+ * 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 RoutingDataLevel {
+  Basemap,
+  Detailed;
+
+  public final int swigValue() {
+    return swigValue;
+  }
+
+  public static RoutingDataLevel swigToEnum(int swigValue) {
+    RoutingDataLevel[] swigValues = RoutingDataLevel.class.getEnumConstants();
+    if (swigValue < swigValues.length && swigValue >= 0 && swigValues[swigValue].swigValue == swigValue)
+      return swigValues[swigValue];
+    for (RoutingDataLevel swigEnum : swigValues)
+      if (swigEnum.swigValue == swigValue)
+        return swigEnum;
+    throw new IllegalArgumentException("No enum " + RoutingDataLevel.class + " with value " + swigValue);
+  }
+
+  @SuppressWarnings("unused")
+  private RoutingDataLevel() {
+    this.swigValue = SwigNext.next++;
+  }
+
+  @SuppressWarnings("unused")
+  private RoutingDataLevel(int swigValue) {
+    this.swigValue = swigValue;
+    SwigNext.next = swigValue+1;
+  }
+
+  @SuppressWarnings("unused")
+  private RoutingDataLevel(RoutingDataLevel swigEnum) {
+    this.swigValue = swigEnum.swigValue;
+    SwigNext.next = this.swigValue+1;
+  }
+
+  private final int swigValue;
+
+  private static class SwigNext {
+    private static int next = 0;
+  }
+}
+

JNI/src/net/osmand/core/jni/SWIGTYPE_p_BinaryMapDataProvider_Metrics__Metric_obtainData.java

@@ -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_BinaryMapDataProvider_Metrics__Metric_obtainData {
+  private long swigCPtr;
+
+  protected SWIGTYPE_p_BinaryMapDataProvider_Metrics__Metric_obtainData(long cPtr, boolean futureUse) {
+    swigCPtr = cPtr;
+  }
+
+  protected SWIGTYPE_p_BinaryMapDataProvider_Metrics__Metric_obtainData() {
+    swigCPtr = 0;
+  }
+
+  protected static long getCPtr(SWIGTYPE_p_BinaryMapDataProvider_Metrics__Metric_obtainData obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+}
+

JNI/src/net/osmand/core/jni/SWIGTYPE_p_BinaryMapPrimitivesProvider_Metrics__Metric_obtainData.java

@@ -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_BinaryMapPrimitivesProvider_Metrics__Metric_obtainData {
+  private long swigCPtr;
+
+  protected SWIGTYPE_p_BinaryMapPrimitivesProvider_Metrics__Metric_obtainData(long cPtr, boolean futureUse) {
+    swigCPtr = cPtr;
+  }
+
+  protected SWIGTYPE_p_BinaryMapPrimitivesProvider_Metrics__Metric_obtainData() {
+    swigCPtr = 0;
+  }
+
+  protected static long getCPtr(SWIGTYPE_p_BinaryMapPrimitivesProvider_Metrics__Metric_obtainData obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+}
+

JNI/src/net/osmand/core/jni/SWIGTYPE_p_BinaryMapRasterBitmapTileProvider_Metrics__Metric_obtainData.java

@@ -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_BinaryMapRasterBitmapTileProvider_Metrics__Metric_obtainData {
+  private long swigCPtr;
+
+  protected SWIGTYPE_p_BinaryMapRasterBitmapTileProvider_Metrics__Metric_obtainData(long cPtr, boolean futureUse) {
+    swigCPtr = cPtr;
+  }
+
+  protected SWIGTYPE_p_BinaryMapRasterBitmapTileProvider_Metrics__Metric_obtainData() {
+    swigCPtr = 0;
+  }
+
+  protected static long getCPtr(SWIGTYPE_p_BinaryMapRasterBitmapTileProvider_Metrics__Metric_obtainData obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+}
+

JNI/src/net/osmand/core/jni/SWIGTYPE_p_FilterMapObjectsByIdFunction.java

@@ -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_FilterMapObjectsByIdFunction {
+  private long swigCPtr;
+
+  protected SWIGTYPE_p_FilterMapObjectsByIdFunction(long cPtr, boolean futureUse) {
+    swigCPtr = cPtr;
+  }
+
+  protected SWIGTYPE_p_FilterMapObjectsByIdFunction() {
+    swigCPtr = 0;
+  }
+
+  protected static long getCPtr(SWIGTYPE_p_FilterMapObjectsByIdFunction obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+}
+

JNI/src/net/osmand/core/jni/SWIGTYPE_p_FilterRoadsByIdFunction.java

@@ -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_FilterRoadsByIdFunction {
+  private long swigCPtr;
+
+  protected SWIGTYPE_p_FilterRoadsByIdFunction(long cPtr, boolean futureUse) {
+    swigCPtr = cPtr;
+  }
+
+  protected SWIGTYPE_p_FilterRoadsByIdFunction() {
+    swigCPtr = 0;
+  }
+
+  protected static long getCPtr(SWIGTYPE_p_FilterRoadsByIdFunction obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+}
+