-
Notifications
You must be signed in to change notification settings - Fork 18
Issue #601 fieldnotes #630
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
hxdimpf
wants to merge
6
commits into
opencaching:master
Choose a base branch
from
hxdimpf:issue_#601_fieldnotes
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
2ce5c31
issue #628 save_user_coords
hxdimpf 68dcca8
issue #601 upload fieldnotes
hxdimpf b237808
Fix fieldnotes: imports, parsing, security, style issues
hxdimpf 29bdd99
draftlogs/upload_fieldnotes: fix error handling, docs, cleanup
hxdimpf 1cb7fe6
fix(#630): address stefopl review feedback
hxdimpf 0ac5c6b
docs: add log type mapping table to Okapi.php
hxdimpf File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,108 @@ | ||
| <?php | ||
|
|
||
| namespace okapi\services\caches\save_user_coords; | ||
|
|
||
| use okapi\core\Db; | ||
| use okapi\core\Exception\ParamMissing; | ||
| use okapi\core\Exception\InvalidParam; | ||
| use okapi\core\Okapi; | ||
| use okapi\core\OkapiServiceRunner; | ||
| use okapi\core\Request\OkapiInternalRequest; | ||
| use okapi\core\Request\OkapiRequest; | ||
| use okapi\Settings; | ||
|
|
||
| class WebService | ||
| { | ||
| public static function options() | ||
| { | ||
| return array( | ||
| 'min_auth_level' => 3 | ||
| ); | ||
| } | ||
|
|
||
| public static function call(OkapiRequest $request) | ||
| { | ||
|
|
||
| $user_coords = $request->get_parameter('user_coords'); | ||
| if ($user_coords == null) | ||
| throw new ParamMissing('user_coords'); | ||
| $parts = explode('|', $user_coords); | ||
| if (count($parts) != 2) | ||
| throw new InvalidParam('user_coords', "Expecting 2 pipe-separated parts, got ".count($parts)."."); | ||
| foreach ($parts as &$part_ref) | ||
| { | ||
| if (!preg_match("/^-?[0-9]+(\.?[0-9]*)$/", $part_ref)) | ||
| throw new InvalidParam('user_coords', "'$part_ref' is not a valid float number."); | ||
| $part_ref = floatval($part_ref); | ||
| } | ||
| list($latitude, $longitude) = $parts; | ||
|
|
||
| # Verify cache_code | ||
|
|
||
| $cache_code = $request->get_parameter('cache_code'); | ||
| if ($cache_code == null) | ||
| throw new ParamMissing('cache_code'); | ||
| $geocache = OkapiServiceRunner::call( | ||
| 'services/caches/geocache', | ||
| new OkapiInternalRequest($request->consumer, $request->token, array( | ||
| 'cache_code' => $cache_code, | ||
| 'fields' => 'internal_id' | ||
| )) | ||
| ); | ||
| $cache_id = $geocache['internal_id']; | ||
|
|
||
| self::update_notes($cache_id, $request->token->user_id, $latitude, $longitude); | ||
|
|
||
| $ret_value = 'ok'; | ||
|
|
||
| $result = array( | ||
| 'status' => $ret_value | ||
| ); | ||
| return Okapi::formatted_response($request, $result); | ||
| } | ||
|
|
||
| private static function update_notes($cache_id, $user_id, $latitude, $longitude) | ||
| { | ||
| /* See: | ||
| * | ||
| * - https://github.com/OpencachingDeutschland/oc-server3/tree/development/htdocs/src/Oc/Libse/CacheNote | ||
| * - https://www.opencaching.de/okapi/devel/dbstruct | ||
| */ | ||
|
|
||
| $rs = Db::query(" | ||
| select max(id) as id | ||
| from coordinates | ||
| where | ||
| type = 2 -- personal note | ||
| and cache_id = '".Db::escape_string($cache_id)."' | ||
| and user_id = '".Db::escape_string($user_id)."' | ||
| "); | ||
| $id = null; | ||
| if($row = Db::fetch_assoc($rs)) { | ||
| $id = $row['id']; | ||
| } | ||
| if ($id == null) { | ||
| Db::query(" | ||
| insert into coordinates ( | ||
| type, latitude, longitude, cache_id, user_id | ||
| ) values ( | ||
| 2, | ||
| '".Db::escape_string($latitude)."', | ||
| '".Db::escape_string($longitude)."', | ||
| '".Db::escape_string($cache_id)."', | ||
| '".Db::escape_string($user_id)."' | ||
| ) | ||
| "); | ||
| } else { | ||
| Db::query(" | ||
| update coordinates | ||
| set latitude = '".Db::escape_string($latitude)."', | ||
| longitude = '".Db::escape_string($longitude)."', | ||
| where | ||
| id = '".Db::escape_string($id)."' | ||
| and type = 2 | ||
| "); | ||
| } | ||
| } | ||
|
|
||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| <xml> | ||
| <brief>Update personal coordinates of a geocache</brief> | ||
| <issue-id>629</issue-id> | ||
| <desc> | ||
| <p>This method allows your users to update the coordinates of their | ||
| personal geocache coordinates.</p> | ||
|
|
||
| <p>Current personal coordinates for the geocache can be retrieved | ||
| using the <b>alt_wpts</b> field in the | ||
| <a href="%OKAPI:methodargref:services/caches/geocache#fields%">services/caches/geocache</a> | ||
| method.</p> | ||
| </desc> | ||
| <req name='cache_code'> | ||
| <p>Code of the geocache</p> | ||
| </req> | ||
| <req name='user_coords'> | ||
| <p>The coordinates are defined by a string in the format "lat|lon"</p> | ||
| <p>Use positive numbers for latitudes in the northern hemisphere and longitudes | ||
| in the eastern hemisphere (and negative for southern and western hemispheres | ||
| accordingly). These are full degrees with a dot as a decimal point (ex. "48.7|15.89").</p> | ||
| </req> | ||
| <common-format-params/> | ||
| <returns> | ||
| <p>A dictionary of the following structure:</p> | ||
| <ul> | ||
| <li>status - ok</li> | ||
| </ul> | ||
| </returns> | ||
| </xml> |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maybe include in the code a reference to https://wiki.opencaching.eu/index.php?title=Log_types as additional documentation?