Made Nearby show all pins that could be presented on the screen, rather than a circle #5553

kanahia1 · 2024-02-15T21:22:39Z

Description (required)

Fixes #5480

What changes did you make and why?

Tests performed (required)

Tested prodDebug on Samsung S21 FE with API level 33.

Screenshots (for UI changes only)

WhatsApp.Video.2024-02-16.at.02.50.42_95e8f853.mp4

kanahia1 · 2024-02-16T04:49:20Z

@nicolas-raoul, Can you please review this PR 🙂

nicolas-raoul

It works and I love it already!

Just a few nits to correct.

app/src/main/java/fr/free/nrw/commons/mwapi/OkHttpJsonApiClient.java

app/src/main/java/fr/free/nrw/commons/nearby/NearbyController.java

app/src/main/java/fr/free/nrw/commons/nearby/fragments/NearbyParentFragment.java

app/src/main/resources/queries/nearby_query.rq

# Conflicts: # gradle.properties

nicolas-raoul

A few more very minor things

app/src/main/java/fr/free/nrw/commons/nearby/NearbyController.java

nicolas-raoul · 2024-02-17T04:46:59Z

app/src/main/java/fr/free/nrw/commons/nearby/NearbyController.java

+            return null;
+        }
+
+        List<Place> places = nearbyPlaces.getFromWikidataQuery(screenTopRight,screenBottomLeft,Locale.getDefault().getLanguage(),shouldQueryForMonuments, customQuery);


spaces, line length

app/src/main/java/fr/free/nrw/commons/nearby/NearbyPlaces.java

nicolas-raoul · 2024-02-17T07:50:46Z

app/src/main/java/fr/free/nrw/commons/mwapi/OkHttpJsonApiClient.java

@@ -328,6 +329,76 @@ public List<Place> getNearbyPlaces(final LatLng cur, final String language, fina
        throw new Exception(response.message());
    }

+    /**


Do we still need the methods above and below this one (with the radius parameter)?

I think it's required during upload to prepopulate categories and depictions based on the image coordinates where their radius is used.

Ah yes thanks! :-)

Does nearby_query.rq still work with a radius though?
If not, maybe splitting the file into two files named for instance rectangle_query_for_nearby.rq and radius_query_for_upload_wizard.rq might be required?

kanahia1 · 2024-02-18T09:49:58Z

@nicolas-raoul, I have made the changes suggested by you 1e732ed. I completely forgot about the monuments since they are also using radius query we may need different files for them, Can you please share the names for nearby_query_monuments.rq

nicolas-raoul · 2024-02-26T09:46:31Z

How about rectangle_query_for_nearby_monuments.rq?
Is a radius query needed for monuments?

kanahia1 · 2024-02-26T19:31:55Z

I found out that everywhere for radius, shouldQueryForMonuments is set to false. So removing radius query for monuments will be okay :-) d7ce78e

kanahia1 · 2024-02-26T19:38:06Z

Hey @nicolas-raoul

Caused by: com.android.build.gradle.tasks.ResourceException: /home/runner/work/apps-android-commons/apps-android-commons/app/src/main/res/values-yue-hant: Error: Invalid resource directory name
	at com.android.build.gradle.tasks.MergeResources.doFullTaskAction(MergeResources.kt:291)
	at com.android.build.gradle.tasks.MergeResources.doTaskAction(MergeResources.kt:320)

Is failing of checks related to #5571

nicolas-raoul · 2024-03-22T14:14:07Z

Sorry for the delay, would you mind fixing thee conflict?

kanahia1 · 2024-03-23T14:50:27Z

Hey @nicolas-raoul, I think all the conflicts are fixed now. Can you please look into it.

kanahia1 · 2024-03-24T08:52:20Z

Friendly ping @nicolas-raoul

nicolas-raoul

Would you mind performing the stylistic changes in a different pull request?
They make it very difficult to spot what actually changed.
Thanks! :-)

kanahia1 · 2024-03-24T14:14:28Z

Hey @nicolas-raoul, Sorry to ask you a simple question but can you please give more information what kind of stylistic changes should I make or should do another pull request by closing this one (So that I could be easy to review)

nicolas-raoul · 2024-03-24T14:17:02Z

I must have dreamt, I don't see them anymore, sorry my bad! 😰

nicolas-raoul

Working well even for Manhattan, thanks!

kanahia1 added 2 commits February 16, 2024 00:25

Changed nearby from circle to rectangle

409b6f6

Fixed bug

8bc3d6b

Removed MAPBOX Token

6a4cfaf

nicolas-raoul requested changes Feb 16, 2024

View reviewed changes

kanahia1 and others added 3 commits February 16, 2024 20:28

Merge branch 'commons-app:main' into issuedemo

b8da147

Merge remote-tracking branch 'origin/issuedemo' into issuedemo

32f6ed0

# Conflicts: # gradle.properties

Fixed minor issues

4d9b10b

nicolas-raoul requested changes Feb 17, 2024

View reviewed changes

Fixed minor issues

c6d4e3f

nicolas-raoul reviewed Feb 17, 2024

View reviewed changes

Changed query files

1e732ed

Merge branch 'commons-app:main' into issuedemo

772614a

Changed monuments query file

d7ce78e

Merge branch 'main' into issuedemo

43c251c

kanahia1 and others added 7 commits March 1, 2024 22:32

Merge branch 'main' into issuedemo

8b8bc62

Merge branch 'commons-app:main' into issuedemo

21214f7

Merge branch 'commons-app:main' into issuedemo

3b172b9

Fixed Unit Tests

8fdb558

Fixed failing tests

fab3a33

Merge branch 'main' into issuedemo

84075b6

Merge branch 'main' into issuedemo

7417521

kanahia1 and others added 2 commits March 22, 2024 19:53

Merge branch 'main' into issuedemo

c709c7d

Fixed errors due to merging

eac659f

kanahia1 requested a review from nicolas-raoul March 23, 2024 14:49

nicolas-raoul requested changes Mar 24, 2024

View reviewed changes

nicolas-raoul approved these changes Mar 24, 2024

View reviewed changes

nicolas-raoul merged commit 724e4db into commons-app:main Mar 24, 2024
1 check passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Made Nearby show all pins that could be presented on the screen, rather than a circle #5553

Made Nearby show all pins that could be presented on the screen, rather than a circle #5553

kanahia1 commented Feb 15, 2024

kanahia1 commented Feb 16, 2024

nicolas-raoul left a comment

nicolas-raoul left a comment

nicolas-raoul Feb 17, 2024

nicolas-raoul Feb 17, 2024

kanahia1 Feb 17, 2024

nicolas-raoul Feb 17, 2024

kanahia1 Feb 17, 2024

kanahia1 commented Feb 18, 2024 •

edited

Loading

nicolas-raoul commented Feb 26, 2024

kanahia1 commented Feb 26, 2024 •

edited

Loading

kanahia1 commented Feb 26, 2024

nicolas-raoul commented Mar 22, 2024

kanahia1 commented Mar 23, 2024

kanahia1 commented Mar 24, 2024

nicolas-raoul left a comment

kanahia1 commented Mar 24, 2024

nicolas-raoul commented Mar 24, 2024

nicolas-raoul left a comment •

edited

Loading

Made Nearby show all pins that could be presented on the screen, rather than a circle #5553

Made Nearby show all pins that could be presented on the screen, rather than a circle #5553

Conversation

kanahia1 commented Feb 15, 2024

kanahia1 commented Feb 16, 2024

nicolas-raoul left a comment

Choose a reason for hiding this comment

nicolas-raoul left a comment

Choose a reason for hiding this comment

nicolas-raoul Feb 17, 2024

Choose a reason for hiding this comment

nicolas-raoul Feb 17, 2024

Choose a reason for hiding this comment

kanahia1 Feb 17, 2024

Choose a reason for hiding this comment

nicolas-raoul Feb 17, 2024

Choose a reason for hiding this comment

kanahia1 Feb 17, 2024

Choose a reason for hiding this comment

kanahia1 commented Feb 18, 2024 • edited Loading

nicolas-raoul commented Feb 26, 2024

kanahia1 commented Feb 26, 2024 • edited Loading

kanahia1 commented Feb 26, 2024

nicolas-raoul commented Mar 22, 2024

kanahia1 commented Mar 23, 2024

kanahia1 commented Mar 24, 2024

nicolas-raoul left a comment

Choose a reason for hiding this comment

kanahia1 commented Mar 24, 2024

nicolas-raoul commented Mar 24, 2024

nicolas-raoul left a comment • edited Loading

Choose a reason for hiding this comment

kanahia1 commented Feb 18, 2024 •

edited

Loading

kanahia1 commented Feb 26, 2024 •

edited

Loading

nicolas-raoul left a comment •

edited

Loading