Git commit 2865e9325e73ff5ad408f197eb4576c583c2cf6f by Gilles Caulier, on behalf of Wolfgang Scheffner. Committed on 09/03/2017 at 09:17. Pushed by cgilles into branch 'master'.
Apply patches #19, 20, 21 about geolocation editor handbook description Note : Screenshots for this section have been alreay commited previously. Only docbook files changes are included in this commit. CCBUGS: 377292 M +4 -2 digikam/index.docbook M +186 -87 digikam/tool-geolocationeditor.docbook M +4 -0 digikam/using-mainwindow-intro.docbook M +5 -2 digikam/using-mainwindow-mapview.docbook M +19 -24 digikam/using-sidebar-maps.docbook M +2 -12 showfoto/index.docbook https://commits.kde.org/digikam-doc/2865e9325e73ff5ad408f197eb4576c583c2cf6f diff --git a/digikam/index.docbook b/digikam/index.docbook index d0f558b..0802750 100644 --- a/digikam/index.docbook +++ b/digikam/index.docbook @@ -6,6 +6,8 @@ <!ENTITY % addindex "IGNORE"> <!ENTITY % English "INCLUDE"><!-- change language only here --> <!ENTITY digikam '<application>digiKam</application>'> + <!ENTITY digikam-app '<application>digiKam</application>'> + <!ENTITY showfoto '<application>Showfoto</application>'> <!ENTITY path ""><!-- relative path to snapshots for digikam and showfoto --> <!-- Introduction Chapter --> @@ -156,7 +158,7 @@ <!-- native --> <!ENTITY doc-tool-acquireimages SYSTEM "tool-acquireimages.docbook"> - <!ENTITY doc-tool-geolocationeditor SYSTEM "tool-geolocationeditor.docbook"> + <!ENTITY doc-tool-geolocation SYSTEM "tool-geolocationeditor.docbook"> <!ENTITY doc-tool-presentation SYSTEM "tool-presentation.docbook"> <!ENTITY doc-tool-metadataeditor SYSTEM "tool-metadataeditor.docbook"> <!ENTITY doc-tool-panorama SYSTEM "tool-panorama.docbook"> @@ -290,7 +292,7 @@ <!-- native --> &doc-tool-acquireimages; - &doc-tool-geolocationeditor; + &doc-tool-geolocation; &doc-tool-presentation; &doc-tool-metadataeditor; &doc-tool-panorama; diff --git a/digikam/tool-geolocationeditor.docbook b/digikam/tool-geolocationeditor.docbook index 2faa0ff..f7ccd25 100644 --- a/digikam/tool-geolocationeditor.docbook +++ b/digikam/tool-geolocationeditor.docbook @@ -1,47 +1,54 @@ -<chapter id="tool-geolocationeditor"> +<chapter id="tool-geolocation"> <chapterinfo> -<abstract> - <para> - The Geolocation Editor allows for adding and editing GPS coordinates of picture metadata. The geo-data is stored into the image (EXIF tags) and the location can be displayed in an internal or external browser map. The Geolocation Editor also offers a <firstterm>reverse geolocation</firstterm> tool. - </para> -</abstract> + <abstract> + <para> + Geolocation means assigning, editing and using metadata which describe the geographic place where images or videos were taken. The source of these metadata can be your camera, a separate GPS receiver or other means of geographical information, in particular maps. + </para> -<keywordset> - <keyword>GPS</keyword> - <keyword>Map</keyword> + <para> + Not only for professional photographers can it be interesting to link an image to a precise geographical location. Not everybody uses an airplane to overfly and scan a certain area with automatic GPS data recording. Environmental planners, military, police, construction bureaus, real estate agencies, all will have an immediate application. + </para> + + <para> + But if, after some time, one has forgotten where the image was taken, if one loves the nice feature to open with a simple click a browser displaying a zoom of the area, if you like to send your image as a postcard to another &digikam; user (who is then able to locate your shot), or if you simply need the documentation aspect of it - having position data stored in a photo is great. + </para> + + </abstract> + + <keywordset> + <keyword>GPS</keyword> + <keyword>Map</keyword> </keywordset> </chapterinfo> -<title>Geolocation Editor</title> - +<title>Geolocation</title> <para> - There are three tools regarding geolocation in &digikam;: + GPS (global positioning system) is used as a generic term throughout this document. It just means a location in the common spherical coordinate system that can be displayed on a map. The actual technical implementation that provides the data can be the American GPS, the Russian GLONAS, the European GALILEO or any other system. </para> + <para> + There are four tools regarding geolocation in &digikam-app; and two in &showfoto;: <orderedlist numeration="arabic"> <listitem><para> - - The <link linkend="using-mainwindow-mapview">Map View</link> on the Left Sidebar which is the search tool for finding images by their GPS data. - + The Map mode of the Image Area which displays images with GPS data on a map depending on the selection on the Left Sidebar, ⪚ the images in the album you selected in the Album View, the images with a certain tag assigned (selected in the Tag View), with a certain label and so on. This is only available in &digikam-app;. </para></listitem> - + <listitem><para> - - The Geolocation Editor we describe in this chapter and which is accessible via <menuchoice><shortcut><keycombo action="simul">&Ctrl;&Shift;<keycap>G</keycap></keycombo></shortcut><guimenu>Item</guimenu><guimenuitem>Edit Geolocation...</guimenuitem></menuchoice> - + The Map View on the Left Sidebar of &digikam-app; which is the search tool for finding images by their GPS data. This is also only available in &digikam-app;. </para></listitem> <listitem><para> + The Geolocation Editor we describe a little bit further below and which is accessible via <menuchoice><shortcut><keycombo action="simul">&Ctrl;&Shift;<keycap>G</keycap></keycombo></shortcut><guimenu>Item</guimenu><guimenuitem>Edit Geolocation...</guimenuitem></menuchoice> (<menuchoice><guimenu>File</guimenu><guimenuitem>Edit Geolocation...</guimenuitem></menuchoice> in &showfoto;). + </para></listitem> + <listitem><para> The <link linkend="using-sidebar-maps">Map</link> tab on the Right Sidebar which shows the location of the image on a map and is purely informative. - </para></listitem> </orderedlist> - <para> - All three are based on the &marble; widget. + All four are based on the &marble; widget. </para> <note><para> @@ -49,18 +56,22 @@ <ulink url="http://www.exiv2.org";>Exiv2 library</ulink>. </para></note> - <para> - <inlinemediaobject> - <imageobject><imagedata fileref="tool-geolocation-editcoords.png" format="PNG" /></imageobject> - </inlinemediaobject> - </para> + <sect1 id="tool-geolocationeditor"> <title>Geolocation Editor</title> + + <para> + The Geolocation Editor allows for adding and editing GPS coordinates of picture metadata. The geo-data is stored into the image (EXIF tags) and the location can be displayed in an internal or external browser map. The Geolocation Editor also offers a <firstterm>Reverse Geocoding</firstterm> tool. + </para> - <para> - The <quote>Geolocation Editor</quote> provides the tools to localize pictures geographically in the common spherical coordinate system (used by GPS/Galileo). Altitude, latitude and longitude, speed, number of satellites, fix type and DOP are editable. - </para> + <para> + <inlinemediaobject> + <imageobject><imagedata fileref="&path;tool-geolocation-editcoords.png" format="PNG" /></imageobject> + </inlinemediaobject> + </para> - <sect1 id="geolocation-title"> <title>Geolocation</title> - + <para> + The Geolocation Editor provides the tools to localize pictures geographically in the common spherical coordinate system (used by GPS/Galileo). Altitude, latitude and longitude, speed, number of satellites, fix type and DOP are editable. + </para> + <para> The editor has two methods to mark the pictures with coordinates: </para> @@ -122,11 +133,16 @@ <listitem><para> The Pan-mode button lets you move the map by left-click and holding on it and then drag it with the mouse to where you need it. The cursor symbol will change to a hand. </para></listitem> + <listitem> + <para> + The Zoom-into-a-group button is useful if you have images so close to each other on the map that all but the topmost are obscured. Once you click on the visible image the zoom factor will be adjusted so that all the other images behind it become visible. If you click on a group of images and nothing really happens they either have exactly the same geographic position and/or the zoom factor is already at its maximum. + </para> + <para> + Note that <quote>group</quote> in this context here has nothing to do with grouped images as described in chapter 2 of the &digikam-app; Handbook. Here the term refers to images which are very close to each other on the map (depending on the zoom factor) or have exactly the same geographic position. + </para> + </listitem> <listitem><para> - The Zoom-into-a-group button is useful if you have images so close to each other on the map that all but the topmost are obscured. Once you click on the visible image the zoom factor will be adjusted so that all the other images behind it become visible. If you click on a group of images and nothing really happens they either have exactly the same geographic position and/or the zoom factor is already at its maximum. - </para></listitem> - <listitem><para> - The Select-images button toggles the selection of an image in the list of images right below the buttons once you click on it on the map. The selection status of all other images in the list remain unchanged. + The Select-images button toggles the selection of an image or a group of images in the list of images right below the buttons once you click on it on the map. The selection status of all other images in the list remain unchanged. Be aware of the fact that there is a kind of two-stage selection! If you click on a thumbnail or marker on the map the selected image(s) in the list of images will become a light blue background. If you click on it in the list the background will become a darker blue and if there where more than one image with light blue background before the others will become un-selected. Only clicking on an image in the list will let its preview appear to the right of the list. </para></listitem> <listitem><para> The Display-bookmarked-positions-on-the-map button is not working at the time of writing because the whole bookmark issue needs to be reorganized. This also affects the @@ -152,14 +168,14 @@ </para> <para> - Note that you can change the layout from one map to two maps, beside each other or stacked via the little drop-down menu at the bottom of the Geolocation Editor. + Note that you can change the layout from one map to two maps, beside or above each other via the little drop-down menu at the bottom of the Geolocation Editor. </para> </sect2> - + <sect2 id="geolocation-edit-coordinates"> <title>Edit Coordinates</title> <para> - The coordinates can be set manually in the <guilabel>Details</guilabel> tab (see sreenshot above). The location can be found and fixed iteratively with the displayed map. Move mouse cursor to the region of interest, zoom in, adjust location, zoom in again, and so on until sufficient accuracy is achieved. Note that the zoom center will always be at the cursor position. Eventually you right click at the desired position and choose <guilabel>Copy Coordinates</guilabel>. Now you can go to the list of images below the map, select one or more images, right-click on them and choose <guilabel>Paste Coordinates</guilabel>. The coordinates will then be displayed in the Latitude and Longitude fields to the right of the map. To save your changes you click the <guilabel>Apply</guilabel> button. + The coordinates can be set manually in the <guilabel>Details</guilabel> tab (see screenshot above). The location can be found and fixed iteratively with the displayed map. Move the mouse cursor to the region of interest, zoom in, adjust location, zoom in again, and so on until sufficient accuracy is achieved. Note that the zoom center will always be at the cursor position. Eventually you right click at the desired position and choose <guilabel>Copy Coordinates</guilabel>. Now you can go to the list of images below the map, select one or more images, right-click on them and choose <guilabel>Paste Coordinates</guilabel>. The coordinates will then be displayed in the Latitude and Longitude fields to the right of the map. To save your changes you click the <guilabel>Apply</guilabel> button right under the <guilabel>DOP</guilabel> field. </para> <para> @@ -167,75 +183,158 @@ </para> <para> - To the right of the map there are beside latitude and longitude fields for altitude, speed, number of satellites, fix type and uncertainty (DOP). You may see these fields already filled in if you select a photograph where your camera wrote these information into the EXIF data. Otherwise you can fill them in manually if you have these data from somewhere else, ⪚ a separate GPS receiver. Only for <guilabel>Altitude</guilabel> the context menu on the list of images offers <guilabel>Look up missing altitude values</guilabel> which causes the editor to look up these data in the map data provided the position (latitude and longitude) is already assigned to the photograph. + To the right of the map there are, beside latitude and longitude, fields for altitude, speed, number of satellites, fix type and uncertainty (DOP). You may see these fields already filled in if you select a photograph where your camera wrote these information into the EXIF data. Otherwise you can fill them in manually if you have these data from somewhere else, ⪚ a separate GPS receiver. Note that you have to check the relevant checkbox before you can edit a field (under &Windows; you may have to double-click it). Only for <guilabel>Altitude</guilabel> the context menu on the list of images offers <guilabel>Look up missing altitude values</guilabel> which causes the editor to look up these data in the map data provided the position (latitude and longitude) is already assigned to the photograph. </para> <para> - Other than that the context menu on the list of images offer items to remove some of the data from the image. Regarding the last item <guilabel>Bookmarks</guilabel> see <link linkend="bookmarkstatus.anchor">here</link>. + To delete geolocation data you got to un-check the relevant checkbox and click the <guilabel>Apply</guilabel> button right under the <guilabel>DOP</guilabel> field. Other than that the context menu on the list of images offer items to remove some of the data from the image. Regarding the last item <guilabel>Bookmarks</guilabel> see <link linkend="bookmarkstatus.anchor">here</link>. </para> </sect2> + <sect2 id="geolocation-correlator"> <title>The Correlator</title> + <para> + In order to correlate your images with geographic data you need to have a GPS tracking information available as a XML file in <literal>gpx</literal> format (<application><ulink url="http://www.gpsbabel.org";>gpsbabel</ulink></application> and <application><ulink url="http://gpsman.sourceforge.net/";>gpsman</ulink></application> + can download and convert tracking data from a GPS device for you). The idea is: while taking your pictures just keep a GPS device running and carry it around with the camera. Once you are done, download the pictures and the GPS tracks, and run the correlator. + </para> + + <para> + <inlinemediaobject> + <imageobject><imagedata fileref="&path;tool-geolocation-correlate1.png" format="PNG" /></imageobject> + </inlinemediaobject> + </para> - <sect2 id="geolocation-correlator"> <title>The correlator</title> <para> - In order to correlate your images with geographic data you need to - have a GPS tracking information available as a XML file in <literal>gpx</literal> - format (<application><ulink url="http://www.gpsbabel.org";>gpsbabel</ulink></application> - and <application><ulink url="http://www.ncc.up.pt/gpsman/";>gpsman</ulink></application> - can download and convert tracking data from a GPS device for you). + Select the images you want to correlate in the application main view, then call the geolocation editor with <menuchoice><shortcut><keycombo action="simul">&Ctrl;&Shift;<keycap>G</keycap></keycombo></shortcut><guimenuitem> </guimenuitem></menuchoice> and switch to the <guilabel>GPS Correlator</guilabel> tab on the Right Sidebar. The above dialog will show up with the selected images in the list below the map. To indicate possible time/location correlation you have to load a track file with <guilabel>Load GPX File</guilabel> that contains GPS data taken at the same time and location as the pictures. + </para> + + <para> + When the file is loaded and <guilabel>Show tracks on map</guilabel> is checked the track is displayed on the map. You can load more than one file and &digikam; will assign different colors to them and display the tracks on the map accordingly. + </para> + + <para> + GPS track data is invariably recorded in UTC (Universal Time Coordinated), so you need to match the camera time with UTC, which can be done with <guilabel>Camera time zone:</guilabel>. Select <guilabel>Same as system</guilabel> if you took the photographs in your home time zone and &digikam; will figure out the difference to UTC from your system time. If you took the photographs somewhere else you got to check <guilabel>Manual:</guilabel> and choose the appropriate difference from the drop-down field to the right. You can use the same mechanism as well to correct a simple mis-adjustment of your camera time for whatever reasons or an offset of a gpx-file due to quirks of a software used to convert other track file formats into gpx. Here comes <guilabel>Fine offset (mm:ss)</guilabel> into play where you can add or subtract up to 59 minutes and 59 seconds to your time difference chosen in the field above. + </para> + + <para> + The <guilabel>Max. time gap (sec.):</guilabel> setting specifies the limit within which GPS time and camera time shall be deemed coincident. The maximum value is 2000 seconds. This means that if no entry in the gpx-file matches the time stamp of the photograph exactly, the position of the entry with the smallest time gap to the photograph will become assigned to it as long as this time gap is smaller than the <guilabel>Max. time gap (sec.):</guilabel> setting. If you wonder which value you should specify here a look into the settings of your track recording device/software or into the gpx-file (which is easily possible with a text editor) might help. The faster you were moving while taking the photograph(s) the more important this decision will be. + </para> + + <para> + <guilabel>Interpolate</guilabel> offers another option in case there is no exact match between the time stamp of your photograph(s) and an entry in the gpx-file and as long as you were moving more or less straight between two recorded GPS positions it will be the more precise option. Here the position of the photograph is calculated (linear interpolated) from the positions of the two closest entries in the gpx-file and the respective differences in time. If, for instance, the time gaps between the two closest entries and the photograph are equal the position assigned will be on a straight line between the positions of the two entries right in the middle. </para> <para> - <menuchoice><guimenu>Image</guimenu> - <guimenuitem>Geolocation</guimenuitem> - <guimenuitem>Correlator</guimenuitem></menuchoice>. - This interface can correlate a previously selected number of pictures - with registered GPS tracking information. + <guilabel>Max. interpol. time gap (min):</guilabel> has nothing to do with policeman Max from Interpol ;-) Instead it determines whether a GPS point is eligible for interpolation. If its time is farther away from the picture time than this limit, it cannot be used. 240 minutes is the maximum time difference that can be introduced here. </para> - <example id="geolocation-geo-correlation-dialog"> - <title>The geo-correlation dialog based on EXIF date/time and tracking data (gpx format)</title> - <screenshot><mediaobject><imageobject><imagedata fileref="tool-geolocation-correlate1.png" format="PNG" /> </imageobject></mediaobject></screenshot> - </example> + <para> + Once your settings are done you click on the <guilabel>Correlate</guilabel> button. If there is no match at all you will get the message "Could not correlate any image - please make sure the timezone and gap settings are correct." Otherwise you will get something like "2 out of 4 images have been correlated. Please check the timezone and gap settings if you think that more images should have been correlated." Best case you get "All images have been correlated. You can now check their position on the map." + </para> <para> - Select the images you want to correlate in the application main view, then call the menu. The above dialog will show up. To indicate possible time/location correlation you have to load a track file with <guilabel>Load GPX File</guilabel> that contains GPS data taken at the same time and location as the pictures with your camera. + If you want to follow this recommendation it is a good idea to change to the <guilabel>Details</guilabel> tab since there you have a preview of the images which can help a lot to identify them on the map. Remember that you always have to click on an image in the list under the map to make its preview show up. Once you are satisfied with the results click the <guilabel>Apply</guilabel> button at the bottom of the Geolocation Editor to save the changes to the image file and the database. + </para> + + </sect2> + + <sect2 id="geolocation-undo-redo"> <title>Undo/Redo</title> + <para> + In the <guilabel>Undo/Redo</guilabel> tab a history is being recorded about all the changes you apply to the images loaded into the Geolocation Editor. The history shows changes made in only one tab or in several tabs and will be deleted only once you leave the editor. After a few actions in the different tabs the record might look like this: </para> <para> - When the file is loaded, an automatic correlation is done showing the attributed coordinates in red. GPS track data is invariably recorded - in GMT time, so you need to match the camera time with GMT, which - can be done with <guilabel>Time Zone</guilabel>. Select the - <emphasis>camera time zone</emphasis> here! - </para> - <para> - The <guilabel>Max. time gap</guilabel> setting specifies the limit - within which GPS time and camera time shall be deemed coincident. - The maximum value is 2000 seconds. - </para> - <tip><para>If you have no tracking data for pictures that were taken - in the same place you can just manually edit a <literal>gpx</literal> - file and apply it to those images. The 2000 second time gap will then - correlate all pictures taken within 20 minutes. - </para></tip> + <inlinemediaobject> + <imageobject><imagedata fileref="&path;tool-geolocation-undo1.png" format="PNG" /></imageobject> + </inlinemediaobject> + </para> + + <para> + The last step is highlighted when you enter the tab. The first step is always labeled <quote>empty</quote> and represents the status the images had when they were loaded. You can click on every step and, depending on what kind of changes you did, you might see the images appearing, disappearing or moving on the map or see the differences in the list of images under the map. Note that the list is configurable by right-clicking on the header. + </para> + + <para> + Now let's assume that you realize that the move in the last step was wrong. You just click on the step before (Details changed), you go to the <guilabel>Search</guilabel> tab (described further below) and you do another move. After returning to the <guilabel>Undo/Redo</guilabel> tab it might look like this: + </para> + + <para> + <inlinemediaobject> + <imageobject><imagedata fileref="&path;tool-geolocation-undo2.png" format="PNG" /></imageobject> + </inlinemediaobject> + </para> + </sect2> + + <sect2 id="geolocation-reverse-geocoding"> <title>Reverse Geocoding</title> + <para> + In this tab you can use a public geoname service to look up address details of the geographic position of one or more images and convert them into tags. In order to do that you need a few preparations. You should be already familiar with the idea of tags and how to create, edit and use them. The best entry into this issue you find in the Tags View section of Chapter 2 of the &digikam-app; handbook. + </para> + <para> + First you should create a root tag in the Tag Manager or in the tag tree of the Left or Right Sidebar. You might name it Location or Places or ... + </para> + <para> + Then you select the image(s) you want to tag (they need to have GPS data assigned), open the Geolocation Editor and click the <guilabel>Reverse Geocoding</guilabel> tab. You will see your tag tree and if you right-click a tag, preferable the one you created for the geo tags, you will see this context menu: + </para> + + <para> + <inlinemediaobject> + <imageobject><imagedata fileref="&path;tool-geolocation-reverse1.png" format="PNG" /></imageobject> + </inlinemediaobject> + </para> - <para> - The option <guilabel>Interpolate</guilabel> and <guilabel>Difference - in min.</guilabel> can be used if there is no match of data. If you - know that in reality there is a location match despite a larger time gap - between camera and GPS, you can set this limit here and click on the - <guilabel>Correlate</guilabel> button to interpolate. - </para> - <example id="geolocation-correlation"> - <title>Correlation</title> - <screenshot><mediaobject><imageobject><imagedata fileref="tool-geolocation-correlate2.png" format="PNG" /> </imageobject></mediaobject></screenshot> - </example> - <para> - 240 minutes is the maximum time difference that can be introduced here. - </para> + <para> + In the main section the tags you can add are sorted from the largest region (country) down to the smallest (house number). If you choose <guilabel>Add all address elements</guilabel> and then fold out the Location tag and all the sub-tags you will have this: + </para> - </sect2> + <para> + <inlinemediaobject> + <imageobject><imagedata fileref="&path;tool-geolocation-reverse2.png" format="PNG" /></imageobject> + </inlinemediaobject> + </para> + + <para> + These red tags in curly brackets are called control tags. They determine which address elements you want the reverse geolocation service you have chosen at the top under <guilabel>Select service</guilabel> to look for. You can still delete some of them with the help of the context menu if you feel that you don't need them or modify the structure by deleting some control tags and add them in other places of the tree or even build a new tree parallel to the first by adding a control tag to the root tag (here: Location). Arranging the control tags on the same level instead of a tree structure can save a lot of redundant tags since the same city or town name exists in more than one state or country let alone street names. But it can make the whole location branch of your tag tree quite long and therefore incalculable. This is to say that you have to find your own solution to this problem depending on your needs, maybe a mix, and the sooner you find it the less work you have to invest in editing your tag tree and the control tags. + </para> + <para> + Let us assume you use the control tags as shown in the above screenshot, select the images you want to tag from the list of images to the left and click <guilabel>Apply reverse geocoding</guilabel>. Then the tag tree might look similar to this: + </para> + + <para> + <inlinemediaobject> + <imageobject><imagedata fileref="&path;tool-geolocation-reverse3.png" format="PNG" /></imageobject> + </inlinemediaobject> + </para> + + <para> + The green tags represent the search result of the selected public reverse geocoding service and are already assigned to the image(s). To save these tags to the image file and the &digikam; database click <guilabel>Apply</guilabel>. The tags will appear as regular tags in your tag tree which you can see already here or in the tag tree of the Left or Right Sidebar. Of course you can still edit them like any other tag in the Tag Manager or in the Left or Right Sidebar, but not here in the Geolocation Editor. + </para> + + </sect2> + + <sect2 id="geolocation-search"> <title>Search</title> + <para> + In the <guilabel>Search</guilabel> tab you can look up places by their geographic names using public geoname services (GeoNames and OpenStreetMap at the time of writing). You just type in a name of a place (city, monument, hotel, ...) into the input field at the top and click <guilabel>Search</guilabel>. In the result list below you will get something like this: + </para> + + <para> + <inlinemediaobject> + <imageobject><imagedata fileref="tool-geolocation-search.png" format="PNG" /></imageobject> + </inlinemediaobject> + </para> + + <para> + Obviously Paris does not only exist in France. So if you were looking for the capital of France you can either scroll down the list until you find an entry that undoubtedly belongs to there like "Arc de Triomphe" and click on it or specify your search a little bit more precise like "Paris, Arc de Triomphe" or "Paris, France". Once you click on an entry in the list the map will become centered to that place and you can now zoom in with the zoom-in button (second from the left below the map). Using this example with GeoNames you will notice that you still get a lot of results and even two labeled only "Arc de Triomphe", the second one a street a few hundred meters away from the arch. With OSM you get only one result. You got to play a bit with the different services in different regions, with more or less precise search terms and then you will get an idea about how to best conduct your searches. + </para> + <para> + For the buttons right above the result list refer to their tooltips! The context menu on search result entries offers + </para> + + <itemizedlist> + <listitem><para><guilabel>Copy coordinates</guilabel> which you can paste later to one or more images in the image list under the map</para></listitem> + <listitem><para><guilabel>Move selected images to this position</guilabel> which is basically the same but more straightforward provided you have the images already loaded into the geolocation editor</para></listitem> + <listitem><para><guilabel>Remove from results list</guilabel> which is particular useful in conjunction with the Keep-the-results-of-old-searches-... button above the results list.</para></listitem> + </itemizedlist> + + </sect2> </sect1> </chapter> diff --git a/digikam/using-mainwindow-intro.docbook b/digikam/using-mainwindow-intro.docbook index a752b74..4b79765 100644 --- a/digikam/using-mainwindow-intro.docbook +++ b/digikam/using-mainwindow-intro.docbook @@ -76,12 +76,16 @@ <listitem><para>Toggle preview of selected image</para></listitem> + <listitem><para>Switch to map view to display images with geolocation data</para></listitem> + <listitem><para>Switch to configurable table view</para></listitem> <listitem><para>Slideshow drop down menu</para></listitem> <listitem><para>Toggle Full Screen (&Ctrl;+&Shift;+<keycap>F</keycap>)</para></listitem> + <listitem><para>Link to digikam.org, also an indicator for ongoing processes</para></listitem> + </orderedlist> </para> diff --git a/digikam/using-mainwindow-mapview.docbook b/digikam/using-mainwindow-mapview.docbook index 322263b..129a1b8 100644 --- a/digikam/using-mainwindow-mapview.docbook +++ b/digikam/using-mainwindow-mapview.docbook @@ -2,15 +2,18 @@ <title>Map View</title> <para> - The whole &digikam; geolocation suite - if you want to call it that way ;-) - consists of three parts: + The whole &digikam; geolocation suite - if you want to call it that way ;-) - consists of four parts: </para> <orderedlist numeration="arabic"> + <listitem><para> + The Map mode of the Image Area which displays images with GPS data on a map depending on the selection on the Left Sidebar, ⪚ the images in the album you selected in the Album View, the images with a certain tag assigned (selected in the Tag View), with a certain label and so on. + </para></listitem> <listitem><para>This view which is the search tool for finding images by their GPS data.</para></listitem> <listitem><para>The <link linkend="tool-geolocationeditor">Geolocation Editor</link> which is accessible via <menuchoice><shortcut><keycombo action="simul">&Ctrl;&Shift;<keycap>G</keycap></keycombo></shortcut><guimenu>Item</guimenu><guimenuitem>Edit Geolocation...</guimenuitem></menuchoice> and allows to set and to edit GPS data.</para></listitem> <listitem><para>The <link linkend="using-sidebar-maps">Map</link> tab on the Right Sidebar which shows the location of the image on a map and is purely informative.</para></listitem> </orderedlist> <para> - All three are based on the &marble; widget. + All four are based on the &marble; widget. </para> <para> diff --git a/digikam/using-sidebar-maps.docbook b/digikam/using-sidebar-maps.docbook index ac39707..7702913 100644 --- a/digikam/using-sidebar-maps.docbook +++ b/digikam/using-sidebar-maps.docbook @@ -2,33 +2,28 @@ <title>Maps</title> <para> - &digikam; offers three geolocation tools: - </para> - - <orderedlist numeration="arabic"> - - <listitem> - <para> - The <link linkend="using-mainwindow-mapview">Map View</link>on the Left Sidebar which is the search tool for finding images by their GPS data. - </para> - </listitem> + There are four tools regarding geolocation in &digikam-app; and two in &showfoto;: + <orderedlist numeration="arabic"> - <listitem> - <para> - The <link linkend="tool-geolocationeditor">Geolocation Editor</link> which is accessible via <menuchoice><shortcut><keycombo action="simul">&Ctrl;&Shift;<keycap>G</keycap></keycombo></shortcut><guimenu>Item</guimenu><guimenuitem>Edit Geolocation...</guimenuitem></menuchoice> and allows to set and to edit GPS data. - </para> - </listitem> + <listitem><para> + The Map mode of the Image Area which displays images with GPS data on a map depending on the selection on the Left Sidebar, ⪚ the images in the album you selected in the Album View, the images with a certain tag assigned (selected in the Tag View), with a certain label and so on. This is only available in &digikam-app;. + </para></listitem> + + <listitem><para> + The Map View on the Left Sidebar of &digikam-app; which is the search tool for finding images by their GPS data. This is also only available in &digikam-app;. + </para></listitem> + + <listitem><para> + The <link linkend="tool-geolocationeditor">Geolocation Editor</link> which is accessible via <menuchoice><shortcut><keycombo action="simul">&Ctrl;&Shift;<keycap>G</keycap></keycombo></shortcut><guimenu>Item</guimenu><guimenuitem>Edit Geolocation...</guimenuitem></menuchoice> + (<menuchoice><guimenu>File</guimenu><guimenuitem>Edit Geolocation...</guimenuitem></menuchoice> in &showfoto;) and allows to set and to edit GPS data. + </para></listitem> - <listitem> - <para> - This tab on the Right Sidebar which shows the location of the image on a map and is purely informative. - </para> - </listitem> + <listitem><para> + The Map tab on the Right Sidebar we are talking about here which shows the location of the image on a map and is purely informative. + </para></listitem> - </orderedlist> - - <para> - All three are based on the &marble; widget. + </orderedlist> + All four are based on the &marble; widget. </para> <para> diff --git a/showfoto/index.docbook b/showfoto/index.docbook index 368c49f..0c03f4a 100644 --- a/showfoto/index.docbook +++ b/showfoto/index.docbook @@ -13,9 +13,6 @@ <!ENTITY doc-intro-contrib SYSTEM "../digikam/intro-contrib.docbook"> <!ENTITY doc-intro-imageformats SYSTEM "../digikam/intro-imageformats.docbook"> - <!ENTITY doc-using-mainwindow SYSTEM "../digikam/using-mainwindow.docbook"> - <!ENTITY doc-using-mainwindow-mapview SYSTEM "../digikam/using-mainwindow-mapview.docbook"> - <!ENTITY doc-using-sidebar SYSTEM "../digikam/using-sidebar.docbook"> <!ENTITY doc-using-sidebar-intro SYSTEM "../digikam/using-sidebar-intro.docbook"> <!ENTITY doc-using-sidebar-properties SYSTEM "../digikam/using-sidebar-properties.docbook"> @@ -104,7 +101,7 @@ <!ENTITY doc-tool-acquireimages SYSTEM "../digikam/tool-acquireimages.docbook"> <!ENTITY doc-tool-presentation SYSTEM "../digikam/tool-presentation.docbook"> - <!ENTITY doc-tool-geolocationeditor SYSTEM "../digikam/tool-geolocationeditor.docbook"> + <!ENTITY doc-tool-geolocation SYSTEM "../digikam/tool-geolocationeditor.docbook"> <!ENTITY doc-tool-metadataeditor SYSTEM "../digikam/tool-metadataeditor.docbook"> <!ENTITY doc-menu-editor SYSTEM "../digikam/menu-editor.docbook"> @@ -249,13 +246,6 @@ &doc-editor-photoediting; &doc-editor-cm; - <sect1 id="using-map-view"> - <title>&showfoto; Map View</title> - - &doc-using-mainwindow-mapview; - - </sect1> - <sect1 id="using-setup"> <title>&showfoto; Configuration</title> @@ -334,7 +324,7 @@ <!-- ******** MISC TOOLS *************************************************** --> &doc-tool-acquireimages; - &doc-tool-geolocationeditor; + &doc-tool-geolocation; &doc-tool-presentation; &doc-tool-metadataeditor;
