Working on custom bookmark icons. #2795

vng · 2022-06-21T12:25:07Z

Accidentally closed previous one #2770.
Closes #2785

biodranik

Тут много рефакторингов и улучшений, которые надо вынести и помержить отдельно, не затягивая, например jni.

Остальное обсудим, будем делать итерационно, я бы начал с нормальных стилей.

biodranik · 2022-06-23T22:24:16Z

drape_frontend/user_mark_shapes.cpp

-          textures->GetSymbolRegion(backgroundSymbol, backgroundRegion);
-          CHECK_EQUAL(region.GetTextureIndex(), backgroundRegion.GetTextureIndex(), ());
+          if (textures->GetSymbolRegionSafe(background, backgroundRegion))
+            CHECK_EQUAL(symbolRegion.GetTextureIndex(), backgroundRegion.GetTextureIndex(), ());


Это точно нужно в релизе?

У нас в целом стратегия предпочтения CHECK там где не критично по производительности.
В drape это имеет смысл, потому что много зависит от зоопарка девайсов.

biodranik · 2022-06-23T22:25:10Z

drape_frontend/user_mark_shapes.cpp

-      dp::TextureManager::SymbolRegion region;
-      textures->GetSymbolRegion(symbolName, region);
-      symbolSize = region.GetPixelSize();
+      textures->GetSymbolRegion(symbolName, symbolRegion);


Зачем нужна небезопасная версия без проверки на возвращаемое значение? Кстати, может std::optional будет лучше?

Она все также проверяет, просто дает дополнительный лог.

Я не сторонник огульного переписывания на optional, тем более что это ничего не дает (ок синтаксис красивее), а иногда еще и ухудшит :)

biodranik · 2022-06-25T05:40:03Z

drape/symbols_texture.cpp

+  }
+  catch (RootException & e)
+  {
+    return false;


Штатно? Лог не нужен?

Не нужен, входная строка может быть не обязательно файл.

biodranik · 2022-06-25T05:41:15Z

drape/symbols_texture.cpp

+
+  int bpp;
+  m_data = stbi_load_from_memory(buffer.data(), static_cast<int>(buffer.size()), &m_width, &m_height, &bpp, 0);
+  if (m_data && bpp == 4) // only this fits TextureFormat::RGBA8


Т.е. мы не все картинки сможем поддерживать?

Если только делать какую-то "конверсию".

biodranik · 2022-06-25T05:43:12Z

drape_frontend/user_mark_shapes.cpp

@@ -120,10 +122,11 @@ std::string GetSymbolNameForZoomLevel(ref_ptr<UserPointMark::SymbolNameZoomInfo>
  if (!symbolNames)
    return {};

-  for (auto itName = symbolNames->crbegin(); itName != symbolNames->crend(); ++itName)
+  auto const & v = symbolNames->m_zoomInfo;
+  for (auto i = v.crbegin(); i != v.crend(); ++i)


Лучше it для итераторов, а i для индексов, тогда проще код читать.

biodranik · 2022-06-27T22:57:34Z

map/bookmark_helpers.cpp

+          fileSavePath = GenerateValidAndUniqueFilePathForKML(file);
+          ZipFileReader::UnzipFile(filePath, file, fileSavePath);
+        }
+        else if (ext == ".png")


В корне будет плохо держать картинки, при их большом количестве сильно замедлится загрузка меток.

Они будут лежать там где указано в kml, обычно это images, files, ...

Сильно не замедлится.

biodranik · 2022-06-27T22:59:32Z

map/bookmark_helpers.cpp

@@ -296,7 +290,9 @@ std::unique_ptr<kml::FileData> LoadKmlFile(std::string const & file, KmlFileType

 std::string GetKMLPath(std::string const & filePath)


Это геттер, который много всего внутри делает, надо его отрефакторить.

biodranik · 2022-06-27T23:00:42Z

map/bookmark_manager.cpp

+  if (!bmData.m_iconPath.empty())
+  {
+    // Check that user icon file is actually present.
+    if (!GetPlatform().IsFileExistsByFullPath(base::JoinPath(GetBookmarksDirectory(), bmData.m_iconPath)))


А зачем именно в CreateBookmark это проверять?

Сейчас это самое логично место. Возможно будет по другому, когда кто-то перепишет все :)

biodranik · 2022-06-27T23:01:40Z

map/map_tests/kmz_unarchive_test.cpp

+  {
+    TEST(base::DeleteFileX(filePath), ());
+    // Cleanup 'files' folder from "test.kmz".
+    TEST(Platform::RmDirRecursively(pngDir), ());


Эти тесты поудаляют другие десктопные метки для работы/других кейзов?

Да, тут стоит пересмотреть логику.

biodranik · 2022-06-27T23:03:44Z

android/jni/com/mapswithme/maps/Framework.cpp

@@ -1338,7 +1337,7 @@ Java_com_mapswithme_maps_Framework_nativeSetMapStyle(JNIEnv * env, jclass, jint
 }

 JNIEXPORT jint JNICALL
-Java_com_mapswithme_maps_Framework_nativeGetMapStyle(JNIEnv * env, jclass, jint mapStyle)
+Java_com_mapswithme_maps_Framework_nativeGetMapStyle(JNIEnv * env, jclass)


env тоже удалить тогда

biodranik

Давай вмержим 1-4, 7, 9 коммиты?

vng · 2022-08-28T06:07:53Z

Давай: #3282

biodranik · 2022-08-28T20:51:05Z

Rebase?

biodranik · 2023-06-18T20:43:50Z

To better support different formats, a newer version of stb_image.h should be used: https://github.com/nothings/stb/blob/master/stb_image.h

Signed-off-by: Viktor Govako <viktor.govako@gmail.com>

Jean-BaptisteC · 2023-10-10T17:14:59Z

Export is broken on Android ?
I didn't see file when I export kml to app mail or messaging app

vng · 2023-10-10T17:37:50Z

I just did a rebase on the latest master. This is a draft :)

Jean-BaptisteC · 2023-10-10T18:04:30Z

Ok, that's weird when I export bookmarks, I have a Memory Warning

MwmActivity app.organicmaps.debug D  MwmActivity.java:2217 onTrimMemory(): trim memory, level = 20
OMcore app.organicmaps.debug I  map/framework.cpp:1158 MemoryWarning(): MemoryWarning

biodranik · 2024-02-01T15:27:49Z

Important requirements for this PR:

KMZ Import with custom png or jpg icons should work. SVG support would be awesome next step.
Imported images should be shared (available for custom bookmark icons in other lists)
Importing some images should not delete/rewrite/replace existing images (by default, most KMZ files have icon.png, or image.png)
The texture size should not be hard-coded but increased dynamically when necessary. Users will import A LOT of bookmarks, it should not crash or break OM.
KMZ export should work as expected, with custom icons included, to be easily edited in Google Earth and other existing editors (umap?).

vng requested a review from biodranik June 21, 2022 12:25

vng force-pushed the vng-bookmarks branch 2 times, most recently from c58c9c1 to 4f42d9f Compare June 23, 2022 21:36

biodranik reviewed Jun 27, 2022

View reviewed changes

vng force-pushed the vng-bookmarks branch from 4f42d9f to 5e1cca3 Compare August 25, 2022 07:59

biodranik reviewed Aug 27, 2022

View reviewed changes

vng force-pushed the vng-bookmarks branch from 5e1cca3 to 070f198 Compare August 30, 2022 09:33

rtsisyk assigned vng Oct 17, 2022

biodranik added Icons Map and app icons Bookmarks and Tracks Bookmarks, imported tracks, and KML, KMZ, KMB, GPX, GPZ import or export labels Dec 5, 2022

biodranik mentioned this pull request Mar 28, 2023

Map tweaks #4871

Open

biodranik mentioned this pull request Jun 18, 2023

Draw custom icons from imported KML/KMZ #1185

Open

vng force-pushed the vng-bookmarks branch 2 times, most recently from 1ecaf69 to 0bf103e Compare June 29, 2023 00:45

vng force-pushed the vng-bookmarks branch from 0bf103e to d4b20a5 Compare October 9, 2023 18:23

vng added 3 commits October 9, 2023 17:26

[drape] Draw custom user marks in Bookmark.

57fcae7

Signed-off-by: Viktor Govako <viktor.govako@gmail.com>

[bookmarks] Import kmz with custom user symbols.

906a98e

Signed-off-by: Viktor Govako <viktor.govako@gmail.com>

[bookmarks] Export to kmz with custom user symbols.

4543389

Signed-off-by: Viktor Govako <viktor.govako@gmail.com>

vng force-pushed the vng-bookmarks branch from d4b20a5 to 4543389 Compare October 9, 2023 20:28

vng marked this pull request as draft October 10, 2023 17:37

biodranik mentioned this pull request Jan 14, 2024

New icon for Bookmarks and Tracks dialog #6561

Open

biodranik mentioned this pull request Feb 15, 2024

[bookmarks] Add code to export multiple files #7356

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Working on custom bookmark icons. #2795

Working on custom bookmark icons. #2795

vng commented Jun 21, 2022

biodranik left a comment

biodranik Jun 23, 2022

vng Jun 28, 2022

biodranik Jun 23, 2022

vng Jun 28, 2022 •

edited

Loading

biodranik Jun 25, 2022

vng Jun 28, 2022

biodranik Jun 25, 2022

vng Jun 28, 2022

biodranik Jun 25, 2022

biodranik Jun 27, 2022

vng Jun 28, 2022

biodranik Jun 27, 2022

biodranik Jun 27, 2022

vng Jun 28, 2022

biodranik Jun 27, 2022

vng Jun 28, 2022

biodranik Jun 27, 2022

biodranik left a comment

vng commented Aug 28, 2022

biodranik commented Aug 28, 2022

biodranik commented Jun 18, 2023

Jean-BaptisteC commented Oct 10, 2023

vng commented Oct 10, 2023

Jean-BaptisteC commented Oct 10, 2023

biodranik commented Feb 1, 2024

		@@ -296,7 +290,9 @@ std::unique_ptr<kml::FileData> LoadKmlFile(std::string const & file, KmlFileType

		std::string GetKMLPath(std::string const & filePath)

Working on custom bookmark icons. #2795

Are you sure you want to change the base?

Working on custom bookmark icons. #2795

Conversation

vng commented Jun 21, 2022

biodranik left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

vng Jun 28, 2022 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

biodranik left a comment

Choose a reason for hiding this comment

vng commented Aug 28, 2022

biodranik commented Aug 28, 2022

biodranik commented Jun 18, 2023

Jean-BaptisteC commented Oct 10, 2023

vng commented Oct 10, 2023

Jean-BaptisteC commented Oct 10, 2023

biodranik commented Feb 1, 2024

vng Jun 28, 2022 •

edited

Loading