feature/google-maps-in-mapeditor-added #33

balazs · 2021-05-01T20:37:36+02:00

balazs commented

2021-05-01 20:37:36 +02:00

Added Google Maps to MapEditor as the default map.
Added a button for selection between Google Maps and Leaflet based map.
Refactored to code to be able to handle modifications on different maps in the same editing session.

* Added Google Maps to MapEditor as the default map. * Added a button for selection between Google Maps and Leaflet based map. * Refactored to code to be able to handle modifications on different maps in the same editing session.

👍 1

balazs added 6 commits 2021-05-01 20:37:37 +02:00

organised Leaflet map and Google Maps into wrappers 1a49b36595

added switching functionality between maps in mapeditor ca40836d40

refactoring and bug fixing related to the map switching 0d9aeac4f8

hide the map selection and jump to location elements on mobile view 2799b19b14

removed unused css declarations; renamed invalidateSize to resize aee146ba62

cleaned up the comment c1e5ed3f0a

balazs requested review from bence 2021-05-01 20:37:44 +02:00

balazs added 1 commit 2021-05-01 20:37:53 +02:00

Merge branch 'develop' into feature/google-maps-in-mapeditor-added ac9b106c65

bence reviewed 2021-05-02 11:28:47 +02:00

public/static/js/map_editor.js Outdated

						
				@ -417,0 +507,4 @@

				                    zoomControlOptions: {

				                        position: google.maps.ControlPosition.LEFT_BOTTOM

				                    },

				                    streetViewControl: true,

bence commented

2021-05-02 11:28:47 +02:00

I would remove this and add a permanent street view cover layer to the map so the available locations will be always shown. (This is the same how the competitor does.)

Reference: https://developers.google.com/maps/documentation/javascript/reference/street-view#StreetViewCoverageLayer

Example:

                var streetViewCover = new google.maps.StreetViewCoverageLayer();
                streetViewCover.setMap(GMapWrapper.map);

I would remove this and add a permanent street view cover layer to the map so the available locations will be always shown. (This is the same how the competitor does.) Reference: https://developers.google.com/maps/documentation/javascript/reference/street-view#StreetViewCoverageLayer Example: ```js var streetViewCover = new google.maps.StreetViewCoverageLayer(); streetViewCover.setMap(GMapWrapper.map); ``` ![](https://i.ibb.co/LPjP4rr/Bildschirmfoto-vom-2021-05-02-11-27-40.png)

balazs commented

2021-05-02 12:37:55 +02:00

I personally consider the permanent street view cover layer disturbing. Can we just add another switch to toggle it?

bence commented

2021-05-02 12:47:35 +02:00

For me it's OK, then it can be done later.

bence marked this conversation as resolved

bence commented

2021-05-02 11:57:30 +02:00

PNG files (as these are binaries) should be stored with git-lfs. I think you don't have git-lfs on your machine, otherwise they would have been committed that way.

Example if files are stored with LFS: https://gitea.e5tv.hu/esoko/mapguesser/compare/develop...git-lfs-example

To fix this, the commits should be created again on this branch after git-lfs is installed.

git reset --hard origin/develop
git cherry-pick --no-commit 1a49b365
git restore --staged -- public/static/img/markers/
git add public/static/img/markers/
git commit
# and cherry pick the remaining commits
git push --force

Rewriting the history and force push is neccessary otherwise binaries would still be stored in the index.

PNG files (as these are binaries) should be stored with git-lfs. I think you don't have git-lfs on your machine, otherwise they would have been committed that way. Example if files are stored with LFS: https://gitea.e5tv.hu/esoko/mapguesser/compare/develop...git-lfs-example To fix this, the commits should be created again on this branch after git-lfs is installed. ```bash git reset --hard origin/develop git cherry-pick --no-commit 1a49b365 git restore --staged -- public/static/img/markers/ git add public/static/img/markers/ git commit # and cherry pick the remaining commits git push --force ``` Rewriting the history and force push is neccessary otherwise binaries would still be stored in the index.

bence commented

2021-05-02 12:01:18 +02:00

It is a very good feature because it seems that the editor is easier to use with Google Maps. Maybe it won't be neccessary to keep the Leaflet version at all so it might be removed in the future.

balazs force-pushed feature/google-maps-in-mapeditor-added from ac9b106c65 to 09d1f819a6

2021-05-02 12:14:50 +02:00

Compare

balazs force-pushed feature/google-maps-in-mapeditor-added from 09d1f819a6 to ef8ad69506

2021-05-02 12:32:28 +02:00

Compare

balazs added 5 commits 2021-05-02 12:35:12 +02:00

added switching functionality between maps in mapeditor 0bb31cbe14

refactoring and bug fixing related to the map switching 745bda11c0

hide the map selection and jump to location elements on mobile view e1eb0077b1

removed unused css declarations; renamed invalidateSize to resize 8b9345eb36

cleaned up the comment d432a5b584