Merge lp://staging/~meese/pantheon-photos/fix-1273847 into lp://staging/~pantheon-photos/pantheon-photos/trunk

Proposed by meese
Status: Work in progress
Proposed branch: lp://staging/~meese/pantheon-photos/fix-1273847
Merge into: lp://staging/~pantheon-photos/pantheon-photos/trunk
Diff against target: 152741 lines (+151513/-109)
43 files modified
Makefile (+27/-4)
icons/earth_map.svg (+230/-0)
icons/gps-marker-selected.svg (+1388/-0)
icons/gps-marker.svg (+941/-0)
icons/import.svg (+55/-0)
icons/places.svg (+679/-0)
src/CheckerboardLayout.vala (+4/-1)
src/CollectionPage.vala (+4/-0)
src/MediaDataRepresentation.vala (+51/-1)
src/MediaPage.vala (+67/-43)
src/Page.vala (+24/-10)
src/Photo.vala (+74/-14)
src/PhotoPage.vala (+4/-0)
src/Resources.vala (+9/-1)
src/SearchFilter.vala (+98/-1)
src/Thumbnail.vala (+11/-10)
src/camera/ImportPage.vala (+1/-1)
src/core/SourceInterfaces.vala (+16/-0)
src/db/DatabaseTable.vala (+13/-1)
src/db/Db.vala (+16/-0)
src/db/GeoLocationTable.vala (+205/-0)
src/db/PhotoTable.vala (+68/-15)
src/db/mk/db.mk (+2/-1)
src/library/Branch.vala (+78/-0)
src/library/LibraryWindow.vala (+47/-0)
src/library/TrashSidebarEntry.vala (+2/-0)
src/library/mk/library.mk (+1/-0)
src/libshotwell.deps (+6/-0)
src/main.vala (+2/-2)
src/maps/CountryCodes.vala (+4189/-0)
src/maps/LocationSearchEntry.vala (+201/-0)
src/maps/MapMarkerPage.vala (+54/-0)
src/maps/MapPage.vala (+307/-0)
src/maps/MapWidget.vala (+563/-0)
src/maps/Maps.vala (+16/-0)
src/maps/PositionMarker.vala (+115/-0)
src/maps/mk/maps.mk (+33/-0)
src/photos/PhotoMetadata.vala (+13/-0)
src/sidebar/metadata/LibraryProperties.vala (+97/-2)
src/sidebar/metadata/MetadataSidebar.vala (+5/-1)
ui/locations.dat (+141768/-0)
ui/map.ui (+27/-0)
units.mk (+2/-1)
To merge this branch: bzr merge lp://staging/~meese/pantheon-photos/fix-1273847
Reviewer Review Type Date Requested Status
Danielle Foré Needs Fixing
Cody Garver Pending
Review via email: mp+232955@code.staging.launchpad.net

This proposal supersedes a proposal from 2014-08-30.

Description of the change

Adds maps to photos.
-Metadata sidebar map widget that can be double clicked to set a GPS location in the photo's DB

-Interactive map page that can be accessed from the library sidebar. Automagically groups photo markers that overlap locations and displays thumbnails when markers are clicked. Clicking the thumbnails will switch to a collection view of all the photos in the group.

-libchamplain and clutter are required to build/use

To post a comment you must log in.
Revision history for this message
Cody Garver (codygarver) wrote : Posted in a previous version of this proposal

Breaks Photo Viewer for me, refuses to launch when I try to open an image with it.

Can you lock the map min height to the height of its area in the window? Here's are 2 screenshots, the first one is current minimum dimensions of the map, the second is closer to what I propose.

review: Needs Fixing
Revision history for this message
Cody Garver (codygarver) wrote : Posted in a previous version of this proposal

Maybe it's more elegant to lock the min width instead, so the map is always covering all of its area

Revision history for this message
Cody Garver (codygarver) wrote : Posted in a previous version of this proposal

Toggling the search causes the map to flash and sometimes go completely black until I toggle a few more times

Revision history for this message
Cody Garver (codygarver) wrote : Posted in a previous version of this proposal

I think aerial map is a better default than geographical

Revision history for this message
meese (meese) wrote : Posted in a previous version of this proposal

>Can you lock the map min height to the height of its area in the window? Here's are 2 screenshots, >the first one is current minimum dimensions of the map, the second is closer to what I propose.
I think you forgot to attach the screenshots.

The problem with locking to height is the view size will change while you're clicking through photos because of different amounts of exif information. What would be best I think is to lock to both with a ratio with a Gtk.AspectFrame, which I tried and it kinda worked but champlain did not play nice with it and would keep adding giant amounts of padding to both sides, I'll try to figure it out..

Still working on the flicker issues.

Revision history for this message
Danielle Foré (danrabbit) wrote :

Can we default to "Geographical" view instead of "Aerial" view?

I think we should ditch "relief" view. I'm not sure that's useful. Also all these extra views in the right click menu. I don't think "cloud" view is relevant to photos.

It looks like there is an extra frame around the view. Can we remove that?

The default view is zoomed out to the whole world. That's a little much. We should do like Facebook and zoom just so that we show all the places you have photos. And I guess if you have 0 locations we should not show the "Places" item like we don't show "Flagged" etc.

If a photo doesn't have a location, we should ask them to add a location by searching for its name (ie: Yosemite National Park) instead of trying to click a location (which will always be inaccurate).

review: Needs Fixing
Revision history for this message
meese (meese) wrote :

All are fixed now.

Revision history for this message
meese (meese) wrote :

Also the geo locations are loaded into the db on the first run which takes about 10-20 seconds. Not something a new user will be likely to run into but for a tester the geo search completion won't be fully loaded until it's done.

Revision history for this message
Danielle Foré (danrabbit) wrote :

Hm, is it possible to get the names of places (restaurants, buildings, etc) in addition to just cities? It looks like Maya can do this.

Also, once we've confirmed a location we should probably zoom in more on that location. I can see almost my whole state from the current zoom level :p

Can we also get the same location marker image from Maya?

Revision history for this message
meese (meese) wrote :

Ohh did not know Maya had maps too. Will do.

2578. By meese

change gps markers to icons from Maya. Make default zoom in closer

Revision history for this message
meese (meese) wrote :

Hey it looks like Maya is actually going searching through your contacts list to find address information to give you things like restaurants and such. Dunno if we want to add something like that to photos?

I just fixed the other two though.

2579. By meese

add places icon for sidebar

Revision history for this message
Danielle Foré (danrabbit) wrote :

Yeah I think it makes sense that anything you can search for in one place we should be able to search in another place.

Revision history for this message
meese (meese) wrote :

And I was wrong actually it will do straight street addresses. Auto complete in Maya doesn't seem to bring anything up for me though does it for you?

2580. By meese

search changes from review

Revision history for this message
meese (meese) wrote :

Fixed hitting enter in the entry box does what Maya does and uses the Geocode lib that hits the web and grabs the closest match and contacts addresses are added to the auto complete. Slightly different though it still uses an offline location list for non contacts auto complete instead of using the geocode lib as I found the lookup was generally too slow and made it feel unresponsive.

Revision history for this message
Danielle Foré (danrabbit) wrote :

It looks like it does find the place on hitting enter. Is there are way to have locations appear in the auto-complete? If not, maybe we should ditch the auto-complete. As you're typing in a location it kind of feels like you're being told that it can't find what you're looking for even though it will find it on pressing enter.

Can we zoom in more in the sidebar? I feel like we're still really far away from a specific location.

I've also noticed that once a location is set, hitting "clear" clears the entry but doesn't remove that location tag. It doesn't appear to be possible to untag a photo's location.

It also looks like the location marker is positioned incorrectly. The location appears to be under the top/left (maybe?) of the marker instead of bottom center.

2581. By meese

fixes

Revision history for this message
meese (meese) wrote :

Fixed.

For the search stuff, yeah I had already written it for grabbing the locations from the geocode library for auto complete and I changed it back and it falls back to the offline auto complete now. It can be a little slow to come up but it sounds like that's better than using a different list for hitting enter vs auto complete.

2582. By meese

merge

2583. By meese

merge fix

Revision history for this message
Danielle Foré (danrabbit) wrote :

Hm there seems to be no indication (in the sidebar) that a search for the location is in progress. Can we either show the map sooner or have a gtk.spinner or something?

Also, the sidebar map needs to be WAY more zoomed in if it's matching to a building. It's showing at like half a European country size instead of at like a city block size

The map view is still super zoomed out by default and nowhere near where my photos are :p

Yay that it finds places now :D

Unmerged revisions

2583. By meese

merge fix

2582. By meese

merge

2581. By meese

fixes

2580. By meese

search changes from review

2579. By meese

add places icon for sidebar

2578. By meese

change gps markers to icons from Maya. Make default zoom in closer

2577. By meese

adds location search entry for setting gps markers and other fixes from review

2576. By meese

change back to geographic map for default, make page not visible if no photos have gps data, remove page border, trim down extra map options

2575. By meese

merge from trunk

2574. By meese

spelling fix

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: