-
Notifications
You must be signed in to change notification settings - Fork 187
Add Map of Syria #29
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
mh-mazen
wants to merge
8
commits into
VictorCazanave:master
Choose a base branch
from
mh-mazen:master
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
Add Map of Syria #29
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
d8da766
Add Saudi Arabia Map
f4ff4bf
Fix Requested Issues
e742349
Add Map of Syria
a082360
Update Main README file
8e72dec
Merge branch 'master' into master
687bdb1
Update Names , Use Offical Names
d638de6
Update README.md
997f552
Update syria.svg
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
Large diffs are not rendered by default.
Oops, something went wrong.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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,41 @@ | ||
| # SY Syria | ||
|
|
||
| Contains all the governorates of Syria: | ||
|
|
||
| - Aleppo | ||
| - As-Suwayda | ||
| - Darra | ||
|
mh-mazen marked this conversation as resolved.
Outdated
|
||
| - Damascus | ||
| - Deir ez-Zor | ||
| - Hama | ||
| - Hasaka | ||
| - Homs | ||
| - Idlib | ||
| - Latakia | ||
| - Quneitra | ||
| - Raqqa | ||
| - Rif Dimashq | ||
| - Tartus | ||
|
|
||
| ## Installation | ||
|
|
||
| ### npm | ||
|
|
||
| `npm install --save @svg-maps/syria` | ||
|
|
||
| ### yarn | ||
|
|
||
| `yarn add @svg-maps/syria` | ||
|
|
||
| ## Credits | ||
|
|
||
| This map is based on the work of [MapSVG](https://mapsvg.com). | ||
|
|
||
| The original map is available [here](https://mapsvg.com/maps/syria) and free to be used in any custom project. | ||
|
|
||
| ### Changes | ||
|
|
||
| - Remove unnecessary attributes | ||
| - Replace title by name attributes | ||
| - Add viewBox | ||
| - Rename ids | ||
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,19 @@ | ||
| { | ||
| "name": "@svg-maps/syria", | ||
| "version": "1.0.0", | ||
| "description": "Map of Syria", | ||
| "main": "index.js", | ||
| "repository": { | ||
| "type": "git", | ||
| "url": "https://github.com/VictorCazanave/svg-maps/tree/master/packages/syria" | ||
| }, | ||
| "keywords": [ | ||
| "svg", | ||
| "map", | ||
| "syria" | ||
| ], | ||
| "author": "Muhammed Hafez <mh.mazen@hotmail.com>", | ||
| "publishConfig": { | ||
| "access": "public" | ||
| } | ||
| } |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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.
Could you remove all the modifications about Saudi Arabia please? If there is an issue with this map, it would better to fix it in another PR
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.
Sorry but some files about Saudi Arabia are still modified:
README.md: Saudi Arabia has already been added before South Koreapackages/saudi-arabia/README.mdpackages/saudi-arabia/index.jsCould you remove these commits please?
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.
I am very sorry for this mistake , can you please advice how to solve this? i can't seem to be able to remove said commits
Uh oh!
There was an error while loading. Please reload this page.
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.
No worries ^^
It looks like the merge after pulling messed up your commits 🤔
I think you can reorganize the commits of your master branch to be synchronized with mine:
git checkout master && git rebase -i 906756c1856dfe8b09a5e1de03f46eebc5878a0b(906756c is the last commit before our branches diverge)Or another more radical solution may be to create a new PR from a clean branch:
git checkout master && git branch syria-mapgit fetch upstream master && git reset --hard upstream/mastergit checkout syria-map && git rebase -i mastergit reset mastersyria-mapbranch