Skip to content

Negative rule improvement #1270

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.

Sign up for GitHub

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
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Negative rule improvement #1270

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions vtm/src/org/oscim/theme/rule/Rule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Copyright 2016 devemux86
*
* This file is part of the OpenScienceMap project (http://www.opensciencemap.org).
*
*
* This program is free software: you can redistribute it and/or modify it under the
* terms of the GNU Lesser General Public License as published by the Free Software
* Foundation, either version 3 of the License, or (at your option) any later version.
Expand Down Expand Up @@ -318,10 +318,16 @@ public boolean matchesTags(Tag[] tags) {
if (!containsKeys(tags))
return true;

for (Tag tag : tags)
for (String value : values)
if (Utils.equals(value, tag.value))
return !exclusive;
for (Tag tag : tags) {
for (String key : keys) {
if (Utils.equals(key, tag.key)) {
for (String value : values) {
if (Utils.equals(value, tag.value))
return !exclusive;
}
}
}
}

return exclusive;
}
Expand Down