Репозиторий Sisyphus
Последнее обновление: 1 октября 2023 | Пакетов: 18631 | Посещений: 37038683
en ru br
Репозитории ALT

Группа :: Обучение
Пакет: kde5-marble

 Главная   Изменения   Спек   Патчи   Sources   Загрузить   Gear   Bugs and FR  Repocop 

Патч: alt-remove-country-data.patch
Скачать


commit 6ee658dd93a5fb86ceb4dc4f5d810447fcee562f
Author: Oleg Solovyov <mcpain@altlinux.org>
Date:   Mon Jan 9 14:47:12 2023 +0300
    Don't show country on city
diff --git a/src/lib/marble/webpopup/city.html b/src/lib/marble/webpopup/city.html
index 478b8a719..9af8dfa52 100644
--- a/src/lib/marble/webpopup/city.html
+++ b/src/lib/marble/webpopup/city.html
@@ -41,9 +41,6 @@
 <tr>
   <td><a href="http://en.m.wikipedia.org/wiki/Population_size">Population</a></td><td>%population%</td>
 </tr>
-<tr>
-  <td><a href="http://en.m.wikipedia.org/wiki/State_%28polity%29">Country</a></td><td>%country%</td>
-</tr>
 <tr>
   <td><a href="http://en.m.wikipedia.org/wiki/Federated_state">State</a></td>%state%<td></td>
 </tr>
commit de7d5ddb2d86630c49b0f1c0bfb3b5c749b03f32
Author: Oleg Solovyov <mcpain@altlinux.org>
Date:   Fri Jan 20 15:04:41 2023 +0300
    Remove country code from placemarks in search autocompletion/results
diff --git a/src/lib/marble/GeoDataTreeModel.cpp b/src/lib/marble/GeoDataTreeModel.cpp
index 58d0a5eda..5fc7e2646 100644
--- a/src/lib/marble/GeoDataTreeModel.cpp
+++ b/src/lib/marble/GeoDataTreeModel.cpp
@@ -206,12 +206,7 @@ QVariant GeoDataTreeModel::data( const QModelIndex &index, int role ) const
 
         if (const auto placemark = geodata_cast<GeoDataPlacemark>(object)) {
                 if ( index.column() == 0 ){
-                    if ( placemark->countryCode().isEmpty() ) {
-                        return QVariant( placemark->name() );
-                    } else {
-                        return QVariant(placemark->name() + QLatin1String(" (") + placemark->countryCode() + QLatin1Char(')'));
-                    }
-
+                    return QVariant( placemark->name() );
                 }
                 else if ( index.column() == 1 ){
                     return QVariant( placemark->nodeType() );
commit 798aea1c02dfa3d8f9c81b9709c580fc7722ff32
Author: Oleg Solovyov <mcpain@altlinux.org>
Date:   Fri Jan 20 16:52:39 2023 +0300
    OSM: don't show country in list
diff --git a/src/plugins/runner/nominatim-search/OsmNominatimSearchRunner.cpp b/src/plugins/runner/nominatim-search/OsmNominatimSearchRunner.cpp
index 554332ebd..452f6f9fd 100644
--- a/src/plugins/runner/nominatim-search/OsmNominatimSearchRunner.cpp
+++ b/src/plugins/runner/nominatim-search/OsmNominatimSearchRunner.cpp
@@ -185,13 +185,6 @@ void OsmNominatimRunner::handleResult( QNetworkReply* reply )
                 }
                 placemarkName += administrative;
             }
-            if (!country.isEmpty() && !placemarkName.contains(QLatin1Char(',')) && country != placemarkName) {
-                if( !placemarkName.isEmpty() ) {
-                    placemarkName += QLatin1String(", ");
-                }
-                placemarkName += country;
-                data.addTag(QStringLiteral("addr:country"), country);
-            }
             if (placemarkName.isEmpty()) {
                 placemarkName = desc;
             }
commit 50c4627eecff215fb05308e9ab0eaa06938fc35f
Author: Oleg Solovyov <mcpain@altlinux.org>
Date:   Fri Jan 20 17:07:25 2023 +0300
    OSM: Remove description from search
diff --git a/src/plugins/runner/nominatim-search/OsmNominatimSearchRunner.cpp b/src/plugins/runner/nominatim-search/OsmNominatimSearchRunner.cpp
index 452f6f9fd..9d614f79e 100644
--- a/src/plugins/runner/nominatim-search/OsmNominatimSearchRunner.cpp
+++ b/src/plugins/runner/nominatim-search/OsmNominatimSearchRunner.cpp
@@ -189,7 +189,7 @@ void OsmNominatimRunner::handleResult( QNetworkReply* reply )
                 placemarkName = desc;
             }
             placemark->setName( placemarkName );
-            placemark->setDescription(description);
+            //placemark->setDescription(description);
             placemark->setAddress(desc);
             placemark->setCoordinate( lon.toDouble(), lat.toDouble(), 0, GeoDataCoordinates::Degree );
             const auto category = StyleBuilder::determineVisualCategory(data);
 
дизайн и разработка: Vladimir Lettiev aka crux © 2004-2005, Andrew Avramenko aka liks © 2007-2008
текущий майнтейнер: Michael Shigorin