Merge pull request #118 from openmobilemaps/develop

Release 1.5.1
openmobilemaps · Apr 24, 2023 · d762ff7 · d762ff7
2 parents 62b0567 + 763da8a
commit d762ff7
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 5 deletions.
diff --git a/.github/workflows/sonatype.yml b/.github/workflows/sonatype.yml
@@ -26,19 +26,21 @@ jobs:
           echo ::set-output name=artifactId::$artifactId
           version=$(sed -n -e 's/^VERSION_NAME=//p' android/gradle.properties)
           echo ::set-output name=version::$version
-      - name: Build and Upload to Ubique Maven
+      - name: Setup GPG Key
         env:
           SIGNING_KEY_ARMOR: ${{secrets.MAVEN_SIGNING_KEY_ARMOR_BASE64}}
+        run: |
+          echo "Create .gpg key from secret"
+          echo $SIGNING_KEY_ARMOR | base64 --decode > ./signingkey.asc
+          gpg --quiet --output $GITHUB_WORKSPACE/signingkey.gpg --dearmor ./signingkey.asc
+      - name: Build and Upload to Ubique Maven
+        env:
           SIGNING_KEY_ID: ${{secrets.MAVEN_SIGNING_KEY_ID}}
           SIGNING_KEY_PASSWORD: ${{secrets.MAVEN_SIGNING_KEY_PASSPHRASE}}
           UBIQUE_ARTIFACTORY_URL: ${{secrets.UBIQUE_ARTIFACTORY_URL}}
           UBIQUE_ARTIFACTORY_USER: ${{secrets.UBIQUE_ARTIFACTORY_USER}}
           UBIQUE_ARTIFACTORY_PASS: ${{secrets.UBIQUE_ARTIFACTORY_PASS}}
         run: |
-          echo "Create .gpg key from secret"
-          echo $SIGNING_KEY_ARMOR | base64 --decode > ./signingkey.asc
-          gpg --quiet --output $GITHUB_WORKSPACE/signingkey.gpg --dearmor ./signingkey.asc
-
           cd android
           chmod 0777 gradlew
           echo "### Maven Dependency - Ubique Maven" >> $GITHUB_STEP_SUMMARY
@@ -52,6 +54,9 @@ jobs:
           SIGNING_KEY_PASSWORD: ${{secrets.MAVEN_SIGNING_KEY_PASSPHRASE}}
           SONATYPE_NEXUS_USERNAME: ${{secrets.SONATYPE_NEXUS_USERNAME}}
           SONATYPE_NEXUS_PASSWORD: ${{secrets.SONATYPE_NEXUS_PASSWORD}}
+          UBIQUE_ARTIFACTORY_URL: ${{secrets.UBIQUE_ARTIFACTORY_URL}}
+          UBIQUE_ARTIFACTORY_USER: ${{secrets.UBIQUE_ARTIFACTORY_USER}}
+          UBIQUE_ARTIFACTORY_PASS: ${{secrets.UBIQUE_ARTIFACTORY_PASS}}
         run: |
           cd android
           echo "### Maven Dependency - Maven Central" >> $GITHUB_STEP_SUMMARY

diff --git a/android/.cpp_includes/GpsLayer.h b/android/.cpp_includes/GpsLayer.h
@@ -34,6 +34,10 @@ class GpsLayer : public GpsLayerInterface,
 
     virtual void setMode(GpsMode mode) override;
 
+    virtual void setModeWithRotationReset(GpsMode mode, bool resetRotation) override;
+
+    virtual void setResetRotationOnMapInteraction(bool resetRotation) override;
+
     virtual GpsMode getMode() override;
 
     virtual void enableHeading(bool enable) override;
@@ -146,6 +150,8 @@ class GpsLayer : public GpsLayerInterface,
     double accRotation = 0.0;
 
     const static int GPS_RENDER_PASS_INDEX = 999;
+
+    bool resetRotationOnInteraction;
 
 protected:
     std::shared_ptr<MapInterface> mapInterface;

diff --git a/android/.cpp_includes/GpsLayerInterface.h b/android/.cpp_includes/GpsLayerInterface.h
@@ -22,6 +22,10 @@ class GpsLayerInterface {
 
     virtual void setMode(GpsMode mode) = 0;
 
+    virtual void setModeWithRotationReset(GpsMode mode, bool resetRotation) = 0;
+
+    virtual void setResetRotationOnMapInteraction(bool resetRotation) = 0;
+
     virtual GpsMode getMode() = 0;
 
     virtual void enableHeading(bool enable) = 0;