[editor] Add public_transport=platform and bus=yes to bus_stop

Signed-off-by: map-per <map-per@gmx.de>

android/app/build.gradle

@@ -304,8 +304,8 @@ android {
             "ru",
             "sl",
             "sk",
-            "sr-rCyrl",
-            "sr-rLatn",
+            "sr",
+            "b+sr+Latn",
             "sv",
             "sw",
             "ta",

android/app/src/main/java/app/organicmaps/editor/AdvancedTimetableFragment.java

@@ -53,7 +53,6 @@ public class AdvancedTimetableFragment extends BaseMwmFragment implements View.O
   public void onResume()
   {
     super.onResume();
-    refreshTimetables();
   }
 
   private void initViews(View view)

android/app/src/main/java/app/organicmaps/util/Utils.java

@@ -184,20 +184,6 @@ public class Utils
     }
   }
 
-  public static void showFacebookPage(Activity activity)
-  {
-    try
-    {
-      // Exception is thrown if we don't have installed Facebook application.
-      getPackageInfo(activity.getPackageManager(), Constants.Package.FB_PACKAGE, 0);
-      activity.startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(Constants.Url.FB_OM_COMMUNITY_NATIVE)));
-    }
-    catch (final Exception e)
-    {
-      activity.startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(Constants.Url.FB_OM_COMMUNITY_HTTP)));
-    }
-  }
-
   public static void openUrl(@NonNull Context context, @Nullable String url)
   {
     if (TextUtils.isEmpty(url))

android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageUtils.java

@@ -105,12 +105,4 @@ public class PlacePageUtils
     });
     popup.show();
   }
-
-    public static String buildPanoramaxURL(double lat, double lon)
-    {
-        final String panoramaxURL = "https://api.panoramax.xyz/?map=";
-        final String levelZoom = "16";
-        final String quality_score = "&pic_score=ABC";
-        return panoramaxURL +  levelZoom + "/" + lat + "/" + lon + quality_score;
-    }
 }

android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java

@@ -4,7 +4,6 @@ import static android.view.View.GONE;
 import static android.view.View.VISIBLE;
 import static app.organicmaps.sdk.util.Utils.getLocalizedFeatureType;
 import static app.organicmaps.sdk.util.Utils.getTagValueLocalized;
-import static app.organicmaps.widget.placepage.PlacePageUtils.buildPanoramaxURL;
 
 import android.content.Context;
 import android.content.res.ColorStateList;
@@ -291,9 +290,6 @@ public class PlacePageView extends Fragment
     openIn.setOnClickListener(this);
     openIn.setOnLongClickListener(this);
     openIn.setVisibility(VISIBLE);
-    LinearLayout openPhotoViewer = mFrame.findViewById(R.id.ll__place_open_phviewer);
-    openPhotoViewer.setOnClickListener(this);
-    openPhotoViewer.setVisibility(VISIBLE);
     mTvLatlon = mFrame.findViewById(R.id.tv__place_latlon);
     mWifi = mFrame.findViewById(R.id.ll__place_wifi);
     mTvWiFi = mFrame.findViewById(R.id.tv__place_wifi);
@@ -1009,8 +1005,6 @@ public class PlacePageView extends Fragment
                                                    mMapObject.getName());
       Utils.openUri(requireContext(), Uri.parse(uri), R.string.uri_open_location_failed);
     }
-    else if (id == R.id.ll__place_open_phviewer)
-        Utils.openUrl(requireContext(), buildPanoramaxURL(mMapObject.getLat(),mMapObject.getLon()));
     else if (id == R.id.direction_frame)
       showBigDirection();
     else if (id == R.id.item_icon)
@@ -1058,10 +1052,6 @@ public class PlacePageView extends Fragment
                                                    mMapObject.getName());
       PlacePageUtils.copyToClipboard(requireContext(), mFrame, uri);
     }
-    else if (id == R.id.ll__place_open_phviewer)
-    {
-        PlacePageUtils.copyToClipboard(requireContext(),mFrame, buildPanoramaxURL(mMapObject.getLat(),mMapObject.getLon()));
-    }
     else if (id == R.id.ll__place_operator)
       items.add(mTvOperator.getText().toString());
     else if (id == R.id.ll__place_network)

android/app/src/main/res/layout/place_page_details.xml

@@ -71,8 +71,6 @@
     <include layout="@layout/place_page_latlon"/>
 
     <include layout="@layout/place_page_open_in"/>
-
-    <include layout="@layout/place_page_open_photoviewer" />
   </LinearLayout>
 
   <include

android/app/src/main/res/layout/place_page_open_photoviewer.xml

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/ll__place_open_phviewer"
-    style="@style/PlacePageItemFrame"
-    tools:background="#20FF0000"
-    tools:visibility="visible">
-
-    <com.google.android.material.imageview.ShapeableImageView
-        android:id="@+id/iv__place_open_phviewer"
-        style="@style/PlacePageMetadataIcon"
-        app:srcCompat="@drawable/ic_panoramax"
-        app:tint="?colorSecondary"/>
-
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/tv__place_open_phviewer"
-        android:textAlignment="viewStart"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/open_place_in_pnx"
-        android:textAppearance="@style/MwmTextAppearance.PlacePage.Accent"/>
-</LinearLayout>

android/app/src/main/res/values/strings.xml

@@ -975,5 +975,4 @@
     <string name="download_resources_custom_url_message">Override the default map download server used for map downloads. Leave empty to use CoMaps default server.</string>
     <string name="download_resources_custom_url_summary_none">Not set</string>
     <string name="download_resources_custom_url_error_scheme">Please enter a URL starting with http:// or https://</string>
-    <string name="open_place_in_pnx">Open in Panoramax</string>
 </resources>

android/app/src/main/res/xml/locales_config.xml

@@ -49,7 +49,7 @@
     <locale android:name="ru" />
     <locale android:name="sl" />
     <locale android:name="sk" />
-    <locale android:name="sr-Cyrl" />
+    <locale android:name="sr" />
     <locale android:name="sr-Latn" />
     <locale android:name="sv" />
     <locale android:name="sw" />

android/sdk/src/main/java/app/organicmaps/sdk/util/Constants.java

@@ -22,9 +22,6 @@ public final class Constants
     public static final String LEMMY = "https://sopuli.xyz/c/CoMaps";
     public static final String BLUESKY = "https://bsky.app/profile/comaps.app";
     public static final String PIXELFED = "https://pixelfed.social/comaps";
-    public static final String FB_OM_COMMUNITY_HTTP = "https://www.facebook.com/profile.php?id=61575286559965";
-    public static final String FB_OM_COMMUNITY_NATIVE = "fb://profile/61575286559965";
-
     public static final String CODE_REPO = "https://codeberg.org/comaps/comaps";
 
     public static final String COPYRIGHT = "file:///android_asset/copyright.html";
@@ -36,13 +33,6 @@ public final class Constants
     private Url() {}
   }
 
-  public static class Package
-  {
-    public static final String FB_PACKAGE = "com.facebook.katana";
-
-    private Package() {}
-  }
-
   public static class Vendor
   {
     public static final String HUAWEI = "HUAWEI";

data/mapcss-mapping.csv

@@ -74,7 +74,7 @@ landuse|residential;15;
 # Unpaved paths and trails (e.g. unpaved highway=footway are converted into paths,
 # while segregated shared paths into footway + cycleway, see osm2type.cpp).
 highway|path;16;
-highway|bus_stop;17;
+highway|bus_stop;[highway=bus_stop][public_transport=platform][bus=yes],[highway=bus_stop];;;;17;
 # ~4M usages.
 highway|footway|sidewalk;[highway=footway][footway=sidewalk];;name;int_name;18;
 place|locality;19;

data/styles/default/include/Icons_Label_Colors.mapcss

@@ -103,6 +103,7 @@ node[tourism=wilderness_hut],
 node[amenity=dojo],
 node[leisure=dance],
 node[leisure=fitness_centre],
+node[leisure=miniature_golf],
 node[leisure=sports_centre],
 node[leisure=stadium],
 {text-color: @sport_label;text-halo-radius: 0.1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;}